git-svn-id: https://spexeah.com:8443/svn/Asuro@679 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

src/driver/net/l1/net.pas

@@ -83,7 +83,7 @@ end;
 procedure send(p_data : void; p_len : uint16);
 begin
     push_trace('net.send');
-    writeToLogLn('net.send');
+    writeToLogLn('L1: net.send');
     if CBSend <> nil then CBSend(p_data, p_len);
     pop_trace;
 end;
@@ -94,7 +94,7 @@ var
 
 begin
     push_trace('net.recv');
-    writeToLogLn('net.recv');
+    writeToLogLn('L1: net.recv');
     context:= newPacketContext;
     if CBNext <> nil then CBNext(p_data, p_len, context);
     freePacketContext(context);

src/driver/net/l2/eth2.pas

@@ -35,7 +35,7 @@ var
 
 begin
     push_trace('eth2.recv');
-    if getNetlogHWND <> 0 then writestringlnWND('eth2.recv', getNetlogHWND);
+    writeToLogLn('L2: eth2.recv');
     //console.outputln('net.eth2', 'RECV.');
     buf:= puint8(p_data);
     

src/driver/net/l3/arp.pas

@@ -5,7 +5,7 @@ interface
 uses
     tracer,
     util, lists, console,
-    nettypes, netutils,
+    net, nettypes, netutils,
     netlog,
     eth2;
 
@@ -22,9 +22,6 @@ function MACToIIPv4(mac : puint8) : puint8;
 
 implementation
 
-uses
-    net;
-
 var
     Registered : Boolean = false;
     Cache      : PLinkedListBase;
@@ -73,7 +70,7 @@ var
 
 begin
     push_trace('arp.recv');
-    writeToLogLn('arp.recv');
+    writeToLogLn('L3: arp.recv');
     { Get our converted Header }
     Header:= PARPHeader(p_data);
     AHeader.Hardware_Type:= (Header^.Hardware_Type_Hi SHL 8) + Header^.Hardware_Type_Lo;
@@ -87,31 +84,31 @@ begin
     copyIPv4(@Header^.Destination_Protocol[0], @AHeader.Destination_Protocol[0]);
     case AHeader.Operation of
         $1:begin { ARP Request }
-            writeToLogLn('arp.recv.arp.req');
+            writeToLogLn('    arp.recv.arp.req');
         end;
         $2:begin { ARP Reply }
-            writeToLogLn('arp.recv.arp.rep');
+            writeToLogLn('    arp.recv.arp.rep');
         end;
         $3:begin { RARP Request }
-            writeToLogLn('arp.recv.rarp.req');
+            writeToLogLn('    arp.recv.rarp.req');
         end;
         $4:begin { RARP Reply }
-            writeToLogLn('arp.recv.rarp.rep');
+            writeToLogLn('    arp.recv.rarp.rep');
         end;
         $5:begin { DRARP Request }
-            writeToLogLn('arp.recv.drarp.req');
+            writeToLogLn('    arp.recv.drarp.req');
         end;
         $6:begin { DRARP Reply }
-            writeToLogLn('arp.recv.drarp.rep');
+            writeToLogLn('    arp.recv.drarp.rep');
         end;
         $7:begin { DRARP Error }
-            writeToLogLn('arp.recv.drarp.err');
+            writeToLogLn('    arp.recv.drarp.err');
         end;
         $8:begin { InARP Request }
-            writeToLogLn('arp.recv.inarp.req');
+            writeToLogLn('    arp.recv.inarp.req');
         end;
         $9:begin { InARP Reply }
-            writeToLogLn('arp.recv.inarp.rep');
+            writeToLogLn('    arp.recv.inarp.rep');
         end;
     end;
     pop_trace;

src/driver/net/l3/ipv4.pas

@@ -29,7 +29,7 @@ var
 
 begin
     push_trace('ipv4.recv');
-    writeToLogLn('ipv4.recv');
+    writeToLogLn('L3: ipv4.recv');
     Header:= PIPV4Header(p_data);
     AHeader.version:= Header^.version;
     AHeader.header_len:= Header^.header_len;

src/include/asuro.pas

@@ -9,14 +9,14 @@ const
      VERSION_SUB   = '1';
      REVISION      = '677';
      RELEASE       = 'ia';
-     LINE_COUNT    = 27664;
+     LINE_COUNT    = 27661;
      FILE_COUNT    = 89;
      DRIVER_COUNT  = 32;
      FPC_VERSION   = '2.6.4';
      NASM_VERSION  = '2.10.09';
      MAKE_VERSION  = '3.81';
      COMPILE_DATE  = '10/05/18';
-     COMPILE_TIME  = '08:56:35';
+     COMPILE_TIME  = '09:02:09';
  
 implementation