wok rev 19883
Add openct
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon Apr 03 15:12:17 2017 +0200 (2017-04-03) |
| parents | 2717d404353b |
| children | 69faca221dde |
| files | linld/stuff/src/MEMCPY32.ASM linld/stuff/src/MEMTOP.ASM linld/stuff/src/XMM.ASM openct-dev/receipt openct/receipt |
line diff
1.1 --- a/linld/stuff/src/MEMCPY32.ASM Mon Apr 03 10:59:15 2017 +0200 1.2 +++ b/linld/stuff/src/MEMCPY32.ASM Mon Apr 03 15:12:17 2017 +0200 1.3 @@ -169,7 +169,9 @@ 1.4 xor dx,dx 1.5 xor si,si 1.6 mov ax,[bp+8] ; srcseg 1.7 - call near N_LXLSH@4 1.8 + mov cl,4 1.9 + extrn N_LXLSH@:near 1.10 + call near N_LXLSH@ 1.11 add [bp+10],ax ; srcofs lo 1.12 adc [bp+10+2],dx ; srcofs hi 1.13 @@2flat: 1.14 @@ -260,7 +262,7 @@ 1.15 ;db 66h ;operand width override for ecx 1.16 db 67h ;address width override for esi/edi 1.17 rep movsb 1.18 - cld 1.19 + ;cld 1.20 1.21 ;****** Return to rm ******************************************* 1.22 dec ax ;CR0_PE off 1.23 @@ -314,21 +316,6 @@ 1.24 1.25 endp N_LXURSH@4 1.26 1.27 - global N_LXLSH@:near 1.28 - global N_LXLSH@4:near 1.29 - proc N_LXLSH@4 near 1.30 - 1.31 - mov cl,4 1.32 -N_LXLSH@: 1.33 - mov ch,0 1.34 -@@loop: 1.35 - shl ax,1 1.36 - rcl dx,1 1.37 - loop @@loop 1.38 - ret 1.39 - 1.40 - endp N_LXLSH@4 1.41 - 1.42 endif 1.43 1.44 ends _TEXT
2.1 --- a/linld/stuff/src/MEMTOP.ASM Mon Apr 03 10:59:15 2017 +0200 2.2 +++ b/linld/stuff/src/MEMTOP.ASM Mon Apr 03 15:12:17 2017 +0200 2.3 @@ -97,20 +97,21 @@ 2.4 xor dx,dx 2.5 add ah,4h ;account for 1024 low kb 2.6 adc dx,dx ; (optimized to death) 2.7 + mov cl,10 ;multiply by 1024 2.8 + global N_LXLSH@:near 2.9 +N_LXLSH@: 2.10 ifndef NO386 2.11 - shld dx,ax,10 ;multiply by 1024 2.12 - shl ax,10 ; (kbytes -> bytes) 2.13 + shld dx,ax,cl 2.14 + shl ax,cl ; (kbytes -> bytes) 2.15 else 2.16 + mov ch,0 2.17 @@lp: 2.18 - mov cx,10 2.19 - shl ax,1 ;multiply by 1024 2.20 + shl ax,1 2.21 rcl dx,1 2.22 loop @@lp 2.23 endif 2.24 -; mov cx,ax 2.25 -; or cx,dx ;update ZF 2.26 -;@@fail: 2.27 - ret 2.28 + ret 2.29 + 2.30 ; endp _memtop_88 2.31 2.32 ; proc _memtopz near 2.33 @@ -170,32 +171,24 @@ 2.34 2.35 ifndef xmm_hook 2.36 mov ax,4300h 2.37 - cwd 2.38 - mov es,dx 2.39 int 2fh 2.40 cmp al,80h ; 80h = XMS driver installed 2.41 je @@skip 2.42 endif 2.43 + xor bx,bx 2.44 + mov es,bx 2.45 ifndef NO386 2.46 - ifdef xmm_hook 2.47 - push 0 2.48 - pop es 2.49 - endif 2.50 push cs 2.51 push offset int15_88 2.52 pop eax 2.53 - xchg eax,[es:15*4] 2.54 + xchg eax,[es:bx+15*4] 2.55 mov [saved15],eax 2.56 else 2.57 - ifdef xmm_hook 2.58 - xor ax,ax 2.59 - mov es,ax 2.60 - endif 2.61 mov ax,offset int15_88 2.62 - xchg ax,[es:15*4] 2.63 + xchg ax,[es:bx+15*4] 2.64 mov [word saved15],ax 2.65 mov ax,cs 2.66 - xchg ax,[es:15*4+2] 2.67 + xchg ax,[es:bx+15*4+2] 2.68 mov [word saved15+2],ax 2.69 endif 2.70 @@skip:
3.1 --- a/linld/stuff/src/XMM.ASM Mon Apr 03 10:59:15 2017 +0200 3.2 +++ b/linld/stuff/src/XMM.ASM Mon Apr 03 15:12:17 2017 +0200 3.3 @@ -112,11 +112,9 @@ 3.4 mov dx,[bx+8] ; hi m->size 3.5 sub ax,1 3.6 sbb dx,0 3.7 - mov cx,10 3.8 -@@tokblp: 3.9 - shr dx,1 3.10 - rcr ax,1 3.11 - loop @@tokblp 3.12 + mov cl,10 3.13 + extrn N_LXURSH@:near 3.14 + call N_LXURSH@ 3.15 endif 3.16 inc dx 3.17 push bx
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/openct-dev/receipt Mon Apr 03 15:12:17 2017 +0200 4.3 @@ -0,0 +1,21 @@ 4.4 +# SliTaz package receipt. 4.5 + 4.6 +PACKAGE="openct-dev" 4.7 +VERSION="0.6.20" 4.8 +CATEGORY="development" 4.9 +SHORT_DESC="Drivers for several smart card readers, development files." 4.10 +MAINTAINER="pascal.bellard@slitaz.org" 4.11 +LICENSE="LGPL2.1" 4.12 +WEB_SITE="https://github.com/OpenSC/openct" 4.13 +WANTED="openct" 4.14 + 4.15 +DEPENDS="openct pkg-config" 4.16 + 4.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 4.18 +genpkg_rules() 4.19 +{ 4.20 + mkdir -p $fs/usr/lib 4.21 + cp -a $install/usr/lib/*a $fs/usr/lib 4.22 + cp -a $install/usr/lib/pkgconfig $fs/usr/lib 4.23 + cp -a $install/usr/include $fs/usr 4.24 +}
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/openct/receipt Mon Apr 03 15:12:17 2017 +0200 5.3 @@ -0,0 +1,40 @@ 5.4 +# SliTaz package receipt. 5.5 + 5.6 +PACKAGE="openct" 5.7 +VERSION="0.6.20" 5.8 +CATEGORY="misc" 5.9 +SHORT_DESC="Drivers for several smart card readers." 5.10 +MAINTAINER="pascal.bellard@slitaz.org" 5.11 +LICENSE="LGPL2.1" 5.12 +TARBALL="$PACKAGE-$VERSION.tar.gz" 5.13 +WEB_SITE="https://github.com/OpenSC/openct" 5.14 +WGET_URL="$WEB_SITE/archive/$TARBALL" 5.15 + 5.16 +DEPENDS="pcsc-lite libusb" 5.17 +BUILD_DEPENDS="automake libtool pcsc-lite-dev libusb-dev doxygen" 5.18 + 5.19 +# Rules to configure and make the package. 5.20 +compile_rules() 5.21 +{ 5.22 + mkdir -p $DESTDIR/etc 5.23 + ./bootstrap && 5.24 + ./configure --prefix=/usr \ 5.25 + --enable-pcsc \ 5.26 + --enable-usb \ 5.27 + --sysconfdir=/etc \ 5.28 + --infodir=/usr/share/info \ 5.29 + --mandir=/usr/share/man \ 5.30 + $CONFIGURE_ARGS && 5.31 + make && 5.32 + make DESTDIR=$DESTDIR install 5.33 +} 5.34 + 5.35 +# Rules to gen a SliTaz package suitable for Tazpkg. 5.36 +genpkg_rules() 5.37 +{ 5.38 + mkdir -p $fs/usr/lib 5.39 + cp -a $install/usr/lib/*.so* $fs/usr/lib 5.40 + cp -a $install/etc $fs 5.41 + cp -a $install/usr/bin $fs/usr 5.42 + cp -a $install/usr/sbin $fs/usr 5.43 +}