diff --git a/Asuro.iso b/Asuro.iso index 03aa4d31..d13a3b2d 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index dcf26cb4..915bae94 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 dcf26cb4..915bae94 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 d2635fde..48e1b5a3 100644 Binary files a/lib/E1000.ppu and b/lib/E1000.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index 0d93163f..6f82b91f 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index c743664b..5174957f 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 9bf43b9c..ce114223 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/src/driver/network/E1000.pas b/src/driver/network/E1000.pas index 2cabe83c..58585d61 100644 --- a/src/driver/network/E1000.pas +++ b/src/driver/network/E1000.pas @@ -145,19 +145,6 @@ var tx_descs : array[0..E1000_NUM_TX_DESC-1] of PE1000_tx_desc; rx_curr : uint16; tx_curr : uint16; - TestPacket : Array[0..41] of uint8 = ( $ff, $ff, $ff, $ff, $ff, $ff, { eth dest (broadcast) } - $52, $54, $00, $12, $34, $56, { eth source } - $08, $06, { eth type } - $00, $01, { ARP htype } - $08, $00, { ARP ptype } - $06, { ARP hlen } - $04, { ARP plen } - $00, $01, { ARP opcode: ARP_REQUEST } - $52, $54, $00, $12, $34, $56, { ARP hsrc } - 169, 254, 13, 37, { ARP psrc } - $00, $00, $00, $00, $00, $00, { ARP hdst } - 192, 168, 0, 128 { ARP pdst } - ); procedure writeCommand(p_address : uint16; p_value : uint32); var @@ -407,8 +394,36 @@ begin end; procedure console_command_sendtest(params : PParamList); +var + TestPacket : Array[0..41] of uint8 = ( $ff, $ff, $ff, $ff, $ff, $ff, { eth dest (broadcast) } + $52, $54, $00, $12, $34, $56, { eth source } + $08, $06, { eth type } + $00, $01, { ARP htype } + $08, $00, { ARP ptype } + $06, { ARP hlen } + $04, { ARP plen } + $00, $01, { ARP opcode: ARP_REQUEST } + $52, $54, $00, $12, $34, $56, { ARP hsrc } + 169, 254, 13, 37, { ARP psrc } + $00, $00, $00, $00, $00, $00, { ARP hdst } + 192, 168, 0, 128 { ARP pdst } + ); + begin - sendPacket(void(@TestPacket), 42); + TestPacket[6]:= mac[0]; + TestPacket[7]:= mac[1]; + TestPacket[8]:= mac[2]; + TestPacket[9]:= mac[3]; + TestPacket[10]:= mac[4]; + TestPacket[11]:= mac[5]; + + TestPacket[22]:= mac[0]; + TestPacket[23]:= mac[1]; + TestPacket[24]:= mac[2]; + TestPacket[25]:= mac[3]; + TestPacket[26]:= mac[4]; + TestPacket[27]:= mac[5]; + sendPacket(void(@TestPacket[0]), 42); end; function load(ptr : void) : boolean;