diff --git a/Asuro.iso b/Asuro.iso index 7c35caa9..30c5794d 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index 7ceb13fb..bef1e64d 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 7ceb13fb..bef1e64d 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 f9041b05..e12f4409 100644 Binary files a/lib/E1000.ppu and b/lib/E1000.ppu differ diff --git a/lib/asuro.ppu b/lib/asuro.ppu index 7e87d1b1..387c9f0b 100644 Binary files a/lib/asuro.ppu and b/lib/asuro.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index 81c873d9..a4cad604 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index 1782f89d..aba13131 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 06fab468..7dcc70dd 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/lib/shell.ppu b/lib/shell.ppu index c8ae4109..2c19f712 100644 Binary files a/lib/shell.ppu and b/lib/shell.ppu differ diff --git a/lib/terminal.ppu b/lib/terminal.ppu index 11fa1a6c..1b762f87 100644 Binary files a/lib/terminal.ppu and b/lib/terminal.ppu differ diff --git a/src/driver/netdev/E1000.pas b/src/driver/netdev/E1000.pas index 556aa2f8..124f71cb 100644 --- a/src/driver/netdev/E1000.pas +++ b/src/driver/netdev/E1000.pas @@ -486,6 +486,15 @@ end; procedure terminal_command_e1000status(Params : PParamList); begin + console.writestringWND('Card: ', getTerminalHWND); + case card_type of + ctUnknown:console.writestringlnWND('Unknown', getTerminalHWND); + ctE1000:console.writestringlnWND('E1000 Generic', getTerminalHWND); + ct82577LM:console.writestringlnWND('82577LM', getTerminalHWND); + ctI217:console.writestringlnWND('I217', getTerminalHWND); + else console.writestringlnWND('UNIDENTIFIED!!!', getTerminalHWND); + end; + console.writestringWND('Status: ', getTerminalHWND); console.writeHexLnWND(readStatus, getTerminalHWND); @@ -564,7 +573,7 @@ begin load:= true; - if load then registercommandEx('E1000', @terminal_command_e1000status, 'E1000 Information.', true); + if load then registercommand('E1000', @terminal_command_e1000status, 'E1000 Information.'); 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 563967f4..c5dda2cd 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 = 28115; + LINE_COUNT = 28124; 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:33:59'; + COMPILE_TIME = '10:36:59'; implementation