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

2018-05-11 08:53:47 +00:00
parent d7c5857760
commit 24c6acc5ab
14 changed files with 6 additions and 6 deletions
--- a/Asuro.iso
+++ b/Asuro.iso
--- a/bin/kernel.bin
+++ b/bin/kernel.bin
--- a/iso/boot/asuro.bin
+++ b/iso/boot/asuro.bin
--- a/lib/arp.ppu
+++ b/lib/arp.ppu
--- a/lib/asuro.ppu
+++ b/lib/asuro.ppu
--- a/lib/eth2.ppu
+++ b/lib/eth2.ppu
--- a/lib/libpconsole.a
+++ b/lib/libpconsole.a
--- a/lib/libpmultiboot.a
+++ b/lib/libpmultiboot.a
--- a/lib/libpsystem.a
+++ b/lib/libpsystem.a
--- a/lib/shell.ppu
+++ b/lib/shell.ppu
--- a/lib/terminal.ppu
+++ b/lib/terminal.ppu
--- a/src/driver/net/l2/eth2.pas
+++ b/src/driver/net/l2/eth2.pas
@@ -47,7 +47,7 @@ begin
    push_trace('eth2.send');
    writeToLogLn('    L2: eth2.send');
    if p_context <> nil then begin
-        size:= sizeof(TEthernetHeader) + p_len + pad;// + 4;
+        size:= sizeof(TEthernetHeader) + p_len;// + pad;// + 4;
        buffer:= kalloc(size);
        copyMAC(@p_context^.MAC.Source[0], @hdr.src[0]);
        copyMAC(@p_context^.MAC.Destination[0], @hdr.dst[0]);
@@ -55,8 +55,8 @@ begin
        hdr.EthTypeLo:= eth_type AND $FF;
        memcpy(uint32(@hdr), uint32(buffer), sizeof(TEthernetHeader));
        memcpy(uint32(p_data), uint32(buffer)+sizeof(TEthernetHeader), p_len);
-        FCS:= puint32((uint32(buffer) + size) - 4);
-        FCS^:= crc32(puint8(buffer), size - 4);
+        //FCS:= puint32((uint32(buffer) + size) - 4);
+        //FCS^:= crc32(puint8(buffer), size - 4);
        net.send(buffer, size);
        kfree(buffer);
    end;
--- a/src/driver/net/l3/arp.pas
+++ b/src/driver/net/l3/arp.pas
@@ -119,7 +119,7 @@ begin
     CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Destination[0]);
     CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Source[0]);
     CopyMAC(GetMAC, @context^.MAC.Source[0]);
-     CopyMAC(@BROADCAST_MAC[0], @context^.MAC.Destination[0]);
+     CopyMAC(@NULL_MAC[0], @context^.MAC.Destination[0]);
     arp.send($1, $0800, $1, context);
     freePacketContext(context);
 end;
@@ -133,7 +133,7 @@ begin
     CopyIPv4(ip, @context^.IP.Destination[0]);
     CopyIPv4(@getIPv4Config^.Address[0], @context^.IP.Source[0]);
     CopyMAC(GetMAC, @context^.MAC.Source[0]);
-     CopyMAC(@BROADCAST_MAC[0], @context^.MAC.Destination[0]);
+     CopyMAC(@NULL_MAC[0], @context^.MAC.Destination[0]);
     arp.send($1, $0800, $1, context);
     freePacketContext(context);
 end;
--- a/src/include/asuro.pas
+++ b/src/include/asuro.pas
@@ -16,7 +16,7 @@ const
     NASM_VERSION  = '2.10.09';
     MAKE_VERSION  = '3.81';
     COMPILE_DATE  = '11/05/18';
-     COMPILE_TIME  = '09:17:35';
+     COMPILE_TIME  = '09:53:40';
 
 implementation