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

2018-05-10 13:53:50 +00:00 · 2018-05-10 13:53:50 +00:00 · 2feb128853
commit 2feb128853
parent 22751a384d
12 changed files with 6 additions and 3 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/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
@ -36,12 +36,15 @@ procedure send(p_data : void; p_len : uint16; eth_type : uint16; p_context : PPa
 var
    buffer : void;
    hdr    : TEthernetHeader;
+    pad    : sint32;

 begin
+    pad:= 46 - p_len;
+    if pad < 0 then pad:= 0;
    push_trace('eth2.send');
    writeToLogLn('    L2: eth2.send');
    if p_context <> nil then begin
-        buffer:= kalloc(p_len + sizeof(TEthernetHeader));
+        buffer:= kalloc(pad + p_len + sizeof(TEthernetHeader) + pad);
        copyMAC(@p_context^.MAC.Source[0], @hdr.src[0]);
        copyMAC(@p_context^.MAC.Destination[0], @hdr.dst[0]);
        hdr.EthTypeHi:= eth_type SHR 8;
--- a/src/include/asuro.pas
+++ b/src/include/asuro.pas
@ -9,14 +9,14 @@ const
     VERSION_SUB   = '1';
     REVISION      = '677';
     RELEASE       = 'ia';
-     LINE_COUNT    = 27904;
+     LINE_COUNT    = 27907;
     FILE_COUNT    = 89;
     DRIVER_COUNT  = 32;
     FPC_VERSION   = '2.6.4';
     NASM_VERSION  = '2.10.09';
     MAKE_VERSION  = '3.81';
     COMPILE_DATE  = '10/05/18';
-     COMPILE_TIME  = '14:21:06';
+     COMPILE_TIME  = '14:53:45';
 
 implementation