wok rev 21332
Up libltdl (2.4.6), mtp-tools (1.1.16)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Apr 19 15:52:41 2019 +0200 (2019-04-19) |
parents | d17c8727d1ac |
children | 3ed0c77db495 |
files | libltdl/receipt linld/stuff/src/HIMEM.CPP linld/stuff/src/JUMP.ASM linld/stuff/src/LOAD.CPP mtp-tools/receipt |
line diff
1.1 --- a/libltdl/receipt Fri Apr 19 11:01:25 2019 +0100 1.2 +++ b/libltdl/receipt Fri Apr 19 15:52:41 2019 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="libltdl" 1.7 -VERSION="2.4.2" 1.8 +VERSION="2.4.6" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="The GNU Portable Library Tool." 1.11 MAINTAINER="pankso@slitaz.org"
2.1 --- a/linld/stuff/src/HIMEM.CPP Fri Apr 19 11:01:25 2019 +0100 2.2 +++ b/linld/stuff/src/HIMEM.CPP Fri Apr 19 15:52:41 2019 +0200 2.3 @@ -35,7 +35,21 @@ 2.4 } 2.5 2.6 // Called just before rm->pm 2.7 -void last_ditch() { 2.8 +void far last_ditch() { 2.9 + asm { 2.10 + cli 2.11 + push ds 2.12 + push cs 2.13 + pop ds 2.14 +# ifdef NO386 2.15 + push ax 2.16 + push bx 2.17 + push cx 2.18 + push dx 2.19 +# else 2.20 + pusha 2.21 +# endif 2.22 + } 2.23 struct image_himem *m = ± 2.24 u32 *q; 2.25 vm2rm(); 2.26 @@ -85,4 +99,15 @@ 2.27 } while(q != m->bufv); 2.28 } 2.29 } 2.30 + asm { 2.31 +# ifdef NO386 2.32 + pop dx 2.33 + pop cx 2.34 + pop bx 2.35 + pop ax 2.36 +# else 2.37 + popa 2.38 +# endif 2.39 + pop ds 2.40 + } 2.41 }
3.1 --- a/linld/stuff/src/JUMP.ASM Fri Apr 19 11:01:25 2019 +0100 3.2 +++ b/linld/stuff/src/JUMP.ASM Fri Apr 19 15:52:41 2019 +0200 3.3 @@ -159,10 +159,17 @@ 3.4 pushf 3.5 ; finish loading 3.6 extrn @last_ditch$qv:near 3.7 + mov ax,[ss:024Ch] 3.8 + jne @@notzimage 3.9 +@@isipxe: 3.10 + push cs 3.11 call @last_ditch$qv 3.12 dos_shutdown ; clear di; ds=0 3.13 push cs 3.14 pop ds 3.15 +@@notzimage: 3.16 + xor ax,2b30h 3.17 + je @@isipxe 3.18 popf 3.19 ; self move 3.20 ;cld
4.1 --- a/linld/stuff/src/LOAD.CPP Fri Apr 19 11:01:25 2019 +0100 4.2 +++ b/linld/stuff/src/LOAD.CPP Fri Apr 19 15:52:41 2019 +0200 4.3 @@ -186,6 +186,9 @@ 4.4 { 4.5 { 4.6 #endif 4.7 + extern void far last_ditch(); 4.8 + kernelparams->realmode_switch_ofs = (u16) last_ditch; 4.9 + kernelparams->realmode_switch_seg = _CS; 4.10 pm_high++; 4.11 4.12 // Hook on int15 to work around fn 88 DOS breakage
5.1 --- a/mtp-tools/receipt Fri Apr 19 11:01:25 2019 +0100 5.2 +++ b/mtp-tools/receipt Fri Apr 19 15:52:41 2019 +0200 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="mtp-tools" 5.7 -VERSION="1.1.6" 5.8 +VERSION="1.1.16" 5.9 CATEGORY="system-tools" 5.10 SHORT_DESC="Media Transfer Protocol (MTP) utilities" 5.11 MAINTAINER="erjo@slitaz.org"