diff --git a/Asuro.iso b/Asuro.iso index 9ffbec84..7c35caa9 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index 30dd8030..7ceb13fb 100755 Binary files a/bin/kernel.bin and b/bin/kernel.bin differ diff --git a/iso/boot/asuro.bin b/iso/boot/asuro.bin index 30dd8030..7ceb13fb 100755 Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ diff --git a/lib/E1000.ppu b/lib/E1000.ppu index f48a2f2c..f9041b05 100644 Binary files a/lib/E1000.ppu and b/lib/E1000.ppu differ diff --git a/lib/asuro.ppu b/lib/asuro.ppu index c2e4c0ae..7e87d1b1 100644 Binary files a/lib/asuro.ppu and b/lib/asuro.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index e82dbf62..81c873d9 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index b6756a9b..1782f89d 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 0bd7129d..06fab468 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/lib/net.ppu b/lib/net.ppu index 84bb03fa..ff92ce60 100644 Binary files a/lib/net.ppu and b/lib/net.ppu differ diff --git a/lib/shell.ppu b/lib/shell.ppu index 7277198a..c8ae4109 100644 Binary files a/lib/shell.ppu and b/lib/shell.ppu differ diff --git a/lib/terminal.ppu b/lib/terminal.ppu index b0d137b0..11fa1a6c 100644 Binary files a/lib/terminal.ppu and b/lib/terminal.ppu differ diff --git a/src/driver/net/l1/net.pas b/src/driver/net/l1/net.pas index bddf0e8e..3347da5c 100644 --- a/src/driver/net/l1/net.pas +++ b/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; diff --git a/src/driver/netdev/E1000.pas b/src/driver/netdev/E1000.pas index cf6b59f4..556aa2f8 100644 --- a/src/driver/netdev/E1000.pas +++ b/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; diff --git a/src/include/asuro.pas b/src/include/asuro.pas index 34584b78..563967f4 100644 --- a/src/include/asuro.pas +++ b/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