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

src/driver/net/l1/net.pas

@@ -108,18 +108,12 @@ begin
     pop_trace;
 end;
 
-procedure terminal_command_e1000status(Params : PParamList);
-begin
-    console.writeHexLnWND(e1000.readStatus, getTerminalHWND);
-end;
-
 procedure init;
 begin
     push_trace('net.init');
     eth2.register;
     arp.register;
     ipv4.register;
-    terminal.registerCommand('e1000status', @terminal_command_e1000status, 'e1000 status');
     pop_trace;
 end;
 

src/driver/netdev/E1000.pas

@@ -484,6 +484,31 @@ begin
     pop_trace;
 end;
 
+procedure terminal_command_e1000status(Params : PParamList);
+begin
+    console.writestringWND('Status: ', getTerminalHWND);
+    console.writeHexLnWND(readStatus, getTerminalHWND);
+
+    console.writestringWND('CTRL: ', getTerminalHWND);
+    console.writehexlnWND(readCommand(REG_CTRL), getTerminalHWND);
+
+    console.writestringWND('TX Curr: ', getTerminalHWND);
+    console.writeintWND(tx_curr, getTerminalHWND);
+    console.writestringWND('/', getTerminalHWND);
+    console.writeintlnWND(E1000_NUM_TX_DESC, getTerminalHWND);
+
+    console.writestringWND('RX Curr: ', getTerminalHWND);
+    console.writeintWND(rx_curr, getTerminalHWND);
+    console.writestringWND('/', getTerminalHWND);
+    console.writeintlnWND(E1000_NUM_RX_DESC, getTerminalHWND);
+
+    console.writestringWND('RX MEM: ', getTerminalHWND);
+    console.writeHexLnWND(uint32(@rx_descs[0]), getTerminalHWND);
+
+    console.writestringWND('TX MEM: ', getTerminalHWND);
+    console.writeHexLnWND(uint32(@tx_descs[0]), getTerminalHWND);
+end;
+
 function load(ptr : void) : boolean;
 var
     PCI_Info : PPCI_Device;
@@ -539,7 +564,7 @@ begin
 
         load:= true;   
 
-        if load then registercommandEx('E1000', @console_command_sendtest, 'Test sending a ARP Request.', true);
+        if load then registercommandEx('E1000', @terminal_command_e1000status, 'E1000 Information.', true);
         if load then registercommand('MAC', @console_command_mac, 'Print MAC Address.');
     end;
 

src/include/asuro.pas

@@ -9,14 +9,14 @@ const
      VERSION_SUB   = '1';
      REVISION      = '677';
      RELEASE       = 'ia';
-     LINE_COUNT    = 28096;
+     LINE_COUNT    = 28115;
      FILE_COUNT    = 90;
      DRIVER_COUNT  = 32;
      FPC_VERSION   = '2.6.4';
      NASM_VERSION  = '2.10.09';
      MAKE_VERSION  = '3.81';
      COMPILE_DATE  = '12/05/18';
-     COMPILE_TIME  = '10:20:16';
+     COMPILE_TIME  = '10:33:59';
  
 implementation