wok annotate syslinux/stuff/extra/fixes-4.07.u @ rev 25057
linux-libre: fix linux-libre-3.18.129-gnu-slitaz.config
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon Jun 06 11:05:30 2022 +0000 (2022-06-06) |
| parents | |
| children |
| rev | line source |
|---|---|
| pascal@20056 | 1 --- mbr/isohdpfx.S |
| pascal@20056 | 2 +++ mbr/isohdpfx.S |
| pascal@20056 | 3 @@ -167,20 +167,22 @@ |
| pascal@20056 | 4 read_sector_cbios: movb $0x42, %ah ; jmp read_common */ |
| pascal@20056 | 5 movl $0xeb42b4+((read_common-read_sector_cbios-4) << 24), \ |
| pascal@20056 | 6 (read_sector_cbios) |
| pascal@20056 | 7 - jmp 1f |
| pascal@20056 | 8 + jmp 2f |
| pascal@20056 | 9 1: |
| pascal@20056 | 10 + xor %cx, %cx /* Clear EBIOS flag. */ |
| pascal@20056 | 11 +2: |
| pascal@20056 | 12 popw %dx |
| pascal@20056 | 13 pushw %cx /* EBIOS flag */ |
| pascal@20056 | 14 |
| pascal@20056 | 15 /* Get (C)HS geometry */ |
| pascal@20056 | 16 movb $0x08, %ah |
| pascal@20056 | 17 int $0x13 |
| pascal@20056 | 18 - andw $0x3f, %cx /* Sector count */ |
| pascal@20056 | 19 popw %bx /* EBIOS flag */ |
| pascal@20056 | 20 - pushw %cx /* -16: Save sectors on the stack */ |
| pascal@20056 | 21 movzbw %dh, %ax /* dh = max head */ |
| pascal@20056 | 22 incw %ax /* From 0-based max to count */ |
| pascal@20056 | 23 - pushw %ax /* -18: Save heads on the stack */ |
| pascal@20056 | 24 + pushw %ax /* -16: Save heads on the stack */ |
| pascal@20056 | 25 + andw $0x3f, %cx /* Sector count */ |
| pascal@20056 | 26 + pushw %cx /* -18: Save sectors on the stack */ |
| pascal@20056 | 27 mulw %cx /* Heads*sectors -> sectors per cylinder */ |
| pascal@20056 | 28 |
| pascal@20056 | 29 pushw %bx /* -20: EBIOS flag */ |
| pascal@20056 | 30 --- extlinux/main.c |
| pascal@20056 | 31 +++ extlinux/main.c |
| pascal@20056 | 32 @@ -1236,9 +1236,7 @@ |
| pascal@20056 | 33 if (devfd < 0) |
| pascal@20056 | 34 return 1; |
| pascal@20056 | 35 |
| pascal@20056 | 36 - if (opt.reset_adv) |
| pascal@20056 | 37 - syslinux_reset_adv(syslinux_adv); |
| pascal@20056 | 38 - else if (ext_read_adv(path, devfd, &filename) < 0) { |
| pascal@20056 | 39 + if (ext_read_adv(path, devfd, &filename) < 0) { |
| pascal@20056 | 40 close(devfd); |
| pascal@20056 | 41 return 1; |
| pascal@20056 | 42 } |
| pascal@20056 | 43 --- core/isolinux.asm |
| pascal@20056 | 44 +++ core/isolinux.asm |
| pascal@20056 | 45 @@ -426,14 +426,17 @@ |
| pascal@20056 | 46 .ok: |
| pascal@20056 | 47 xor bx,bx |
| pascal@20056 | 48 push bp |
| pascal@20056 | 49 + push eax |
| pascal@20056 | 50 call getlinsec |
| pascal@20056 | 51 + pop eax |
| pascal@20056 | 52 pop cx |
| pascal@20056 | 53 - mov dx,cx |
| pascal@20056 | 54 + movzx edx,cx |
| pascal@20056 | 55 pop bp |
| pascal@20056 | 56 pop bx |
| pascal@20056 | 57 |
| pascal@20056 | 58 shl cx,SECTOR_SHIFT - 4 |
| pascal@20056 | 59 add bx,cx |
| pascal@20056 | 60 + add eax,edx |
| pascal@20056 | 61 sub bp,dx |
| pascal@20056 | 62 jnz .more |
| pascal@20056 | 63 |