wok-6.x diff linux/stuff/linux-header-2.6.30.6.u @ rev 4631
Up: openbox (3.4.9)
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Tue Dec 22 12:42:22 2009 +0100 (2009-12-22) |
parents | b5013b460117 |
children | f163cff3c826 |
line diff
1.1 --- a/linux/stuff/linux-header-2.6.30.6.u Mon Nov 23 11:01:54 2009 +0100 1.2 +++ b/linux/stuff/linux-header-2.6.30.6.u Tue Dec 22 12:42:22 2009 +0100 1.3 @@ -18,7 +18,7 @@ 1.4 1.5 #ifndef SVGA_MODE 1.6 #define SVGA_MODE ASK_VGA 1.7 -@@ -39,53 +41,391 @@ 1.8 +@@ -39,53 +41,394 @@ 1.9 #define ROOT_RDONLY 1 1.10 #endif 1.11 1.12 @@ -104,10 +104,15 @@ 1.13 + 1.14 + cli 1.15 + 1.16 ++ movb $24, %bl # allocate 48 bytes in stack 1.17 ++init_gdt: 1.18 ++ pushw %cx # initialized with 0 1.19 ++ decw %bx 1.20 ++ jnz init_gdt 1.21 ++ 1.22 + xchg %ax, %di # sector count 1.23 + cbw # limits = 0 1.24 + incw %cx # cylinder 0, sector 1 1.25 -+ xorw %bx, %bx 1.26 + call read_first_sectors # read setup 1.27 + 1.28 +#define version_offset 0xE 1.29 @@ -146,8 +151,7 @@ 1.30 + int $0x16 1.31 + cmpb $8, %al # BackSpace ? 1.32 + je cmdbs 1.33 -+ cbw 1.34 -+ movw %ax, (%si) # store end of string too 1.35 ++ movb %al, (%si) # store char 1.36 + lodsw # %si += 2 1.37 +cmdbs: 1.38 + cmpw (%di), %si # lower limit is checked 1.39 @@ -155,7 +159,7 @@ 1.40 + call putc # set %ah and %bx 1.41 + cmpb $10, %al # Enter ? 1.42 + jne cmdlp 1.43 -+ movb %bh,-2(%si) # remove CR 1.44 ++ movb %bh,-2(%si) # set end of line, remove CR 1.45 +endcmdline: 1.46 + 1.47 +nocmdline: 1.48 @@ -168,10 +172,6 @@ 1.49 +# no 64kB boundaries are crossed. We try to load it as fast as 1.50 +# possible, loading whole tracks whenever we can. 1.51 + 1.52 -+ movw $24, %cx # allocate 48 bytes in stack 1.53 -+init_gdt: 1.54 -+ push $0 # initialized with 0 1.55 -+ loop init_gdt 1.56 + movw %sp, %si # for bootsect_gdt 1.57 + movb $0x0F, %al # destination = 0x100000 1.58 + movw $syssize, %di 1.59 @@ -272,6 +272,8 @@ 1.60 +#endif 1.61 + pushaw 1.62 +#ifdef SHOW_REGS 1.63 ++ cmpw $0x600,%bp # disk changed ? 1.64 ++ je reset_floppy 1.65 + pushw %es # print %es (named EX) 1.66 + pushw %dx # print %dx 1.67 + pushw %cx # print %cx 1.68 @@ -299,6 +301,7 @@ 1.69 + int $0x10 1.70 + popw %cx 1.71 + loop print_loop 1.72 ++reset_floppy: 1.73 +#endif 1.74 + cbw # %ah = 0 1.75 + int $0x13 # reset controler