wok-current rev 25569

BootProg: fix boot16.asm
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri May 12 21:35:09 2023 +0000 (18 months ago)
parents 3a856211222e
children a999b69d8c24
files BootProg/receipt BootProg/stuff/boot16.asm BootProg/stuff/boot32.asm BootProg/stuff/bootex.asm ddd/receipt qbittorrent/receipt xinput-calibrator/receipt
line diff
     1.1 --- a/BootProg/receipt	Fri May 12 21:18:30 2023 +0100
     1.2 +++ b/BootProg/receipt	Fri May 12 21:35:09 2023 +0000
     1.3 @@ -26,7 +26,7 @@
     1.4  	{
     1.5  		sed "1,2d;s|FAT32SZ|$(stat -c %s boot32.bin)|" $stuff/bootprog.sh
     1.6  		cat ${bs// /.bin }.bin
     1.7 -	} | xz -z --format=lzma --lzma1=lc=0,pb=0,nice=100,dict=4k >> bootprog
     1.8 +	} | xz -z --format=lzma --lzma1=lc=0,pb=0,nice=33,dict=4k >> bootprog
     1.9  	chmod +x bootprog
    1.10  }
    1.11  
     2.1 --- a/BootProg/stuff/boot16.asm	Fri May 12 21:18:30 2023 +0100
     2.2 +++ b/BootProg/stuff/boot16.asm	Fri May 12 21:35:09 2023 +0000
     2.3 @@ -11,7 +11,7 @@
     2.4  ;;                                                                          ;;
     2.5  ;;                                 Features:                                ;;
     2.6  ;;                                 ~~~~~~~~~                                ;;
     2.7 -;; - FAT12 and FAT16 supported using BIOS int 13h function 42h or 02h.      ;;
     2.8 +;; - FAT12 and/or FAT16 supported using BIOS int 13h function 42h or 02h.   ;;
     2.9  ;;                                                                          ;;
    2.10  ;; - Loads a 16-bit executable file in the MS-DOS .COM or .EXE format       ;;
    2.11  ;;   from the root directory of a disk and transfers control to it          ;;
    2.12 @@ -31,7 +31,8 @@
    2.13  ;; - Need a up to date field bpbHiddenSectors to work in a partition ;      ;;
    2.14  ;;   most formatters don't update it correcly in extended partitions.       ;;
    2.15  ;;                                                                          ;;
    2.16 -;; - Partition must fit in the first 8GB disk for CHS reads.                ;;
    2.17 +;; - Partition must fit in the first 8GB disk of the for CHS reads.         ;;
    2.18 +;;   (or 2TB for LBA reads).                                                ;;
    2.19  ;;                                                                          ;;
    2.20  ;;                                                                          ;;
    2.21  ;;                                Known Bugs:                               ;;
    2.22 @@ -93,10 +94,10 @@
    2.23  %define bx(label)       bx+label-boot
    2.24  %define si(label)       si+label-boot
    2.25  NullEntryCheck          equ     1               ; +2 bytes
    2.26 -ReadRetry               equ     1               ; +9/+10 bytes
    2.27 -LBAsupport              equ     1               ; +16 bytes
    2.28 +ReadRetry               equ     1               ; +9/+13 bytes
    2.29 +LBAsupport              equ     1               ; +18 bytes
    2.30  CHSsanityCheck          equ     1               ; +12/+16 bytes 
    2.31 -GeometryCheck           equ     1               ; +18 bytes
    2.32 +GeometryCheck           equ     1               ; +20 bytes
    2.33  CheckAttrib             equ     0               ; +6 bytes
    2.34  WaitForKey              equ     0               ; +5 bytes
    2.35  SectorOf512Bytes        equ     0               ; -4/-6 bytes
    2.36 @@ -210,7 +211,7 @@
    2.37  
    2.38  %if GeometryCheck != 0
    2.39   %if ((main-boot) & 3Fh) != 0
    2.40 -        xchg    ax, cx                  ; ax & 3Fh == 0
    2.41 +        xor     cx, cx
    2.42   %endif
    2.43          mov     ah, 8                   ; update AX,BL,CX,DX,DI, and ES registers
    2.44          int     13h                     ; may destroy SI,BP, and DS registers
    2.45 @@ -597,18 +598,19 @@
    2.46          dec     bx
    2.47          push    di
    2.48  %endif
    2.49 +        mov     si, sp
    2.50  
    2.51          xchg    ax, cx                  ; save low LBA
    2.52          xchg    ax, dx                  ; get high LBA
    2.53          cwd                             ; clear dx (LBA offset <1TB)
    2.54          idiv    word [bx(bpbSectorsPerTrack)] ; up to 8GB disks
    2.55  
    2.56 - %if CHSsanityCheck != 0
    2.57 +%if CHSsanityCheck != 0
    2.58          inc     ax
    2.59          cmp     ax, [bx(bpbHeadsPerCylinder)]
    2.60          ja      CHSoverflow
    2.61          dec     ax
    2.62 - %endif
    2.63 +%endif
    2.64          xchg    ax, cx                  ; restore low LBA, save high LBA / SPT
    2.65          idiv    word [bx(bpbSectorsPerTrack)]
    2.66                  ; ax = LBA / SPT
    2.67 @@ -637,16 +639,13 @@
    2.68   %endif
    2.69  %endif
    2.70  CHSoverflow:
    2.71 -        mov     dl, [bx(DriveNumber)]
    2.72 -                ; dl = drive no.
    2.73 -        mov     si, sp
    2.74 -%if CHSsanityCheck != 0
    2.75 - %if ReadRetry != 0 || LBAsupport != 0
    2.76 +%if CHSsanityCheck != 0 && (ReadRetry != 0 || LBAsupport != 0)
    2.77          pushf
    2.78 - %endif
    2.79  %endif
    2.80  
    2.81  ReadSectorRetry:
    2.82 +        mov     dl, [bx(DriveNumber)]
    2.83 +                ; dl = drive no.
    2.84  %if LBAsupport != 0
    2.85          mov     ah, 42h                 ; ah = 42h = extended read function no.
    2.86          int     13h                     ; extended read sectors (DL, DS:SI)
     3.1 --- a/BootProg/stuff/boot32.asm	Fri May 12 21:18:30 2023 +0100
     3.2 +++ b/BootProg/stuff/boot32.asm	Fri May 12 21:35:09 2023 +0000
     3.3 @@ -91,13 +91,13 @@
     3.4  ClusterMask             equ     1               ; +9 bytes
     3.5  NullEntryCheck          equ     1               ; +5 bytes
     3.6  CheckAttrib             equ     1               ; +6 bytes
     3.7 -NonMirroredFATs         equ     1               ; +18 bytes
     3.8 -ReadRetry               equ     1               ; +7 bytes
     3.9 -LBA48bits               equ     1               ; +15 bytes
    3.10 -CHSsupport              equ     1               ; +27 bytes max 8GB
    3.11 -CHSgeometryCheck        equ     1               ; +18 bytes
    3.12 -CHSsanityCheck          equ     1               ; +5 bytes 
    3.13 -SectorOf512Bytes        equ     0               ; -5 bytes
    3.14 +NonMirroredFATs         equ     1               ; +20 bytes
    3.15 +ReadRetry               equ     1               ; +6/7 bytes
    3.16 +LBA48bits               equ     1               ; +10 bytes
    3.17 +CHSsupport              equ     1               ; +35 bytes max 8GB
    3.18 +CHSgeometryCheck        equ     1               ; +20 bytes
    3.19 +CHSsanityCheck          equ     1               ; +9 bytes 
    3.20 +SectorOf512Bytes        equ     0               ; -4 bytes
    3.21  Always2FATs             equ     0               ; -4 bytes
    3.22  WaitForKey              equ     0               ; +5 bytes
    3.23  
     4.1 --- a/BootProg/stuff/bootex.asm	Fri May 12 21:18:30 2023 +0100
     4.2 +++ b/BootProg/stuff/bootex.asm	Fri May 12 21:35:09 2023 +0000
     4.3 @@ -78,10 +78,10 @@
     4.4  
     4.5  %define bx(label)       bx+label-boot
     4.6  %define si(label)       si+label-boot
     4.7 -NullEntryCheck          equ     1               ; +3 bytes
     4.8 -ReadRetry               equ     1               ; +8 bytes
     4.9 -SectorOf512Bytes        equ     0               ; -11 bytes
    4.10 -CheckAttrib             equ     0               ; +18 bytes
    4.11 +NullEntryCheck          equ     1               ; +3/5 bytes
    4.12 +ReadRetry               equ     1               ; +7 bytes
    4.13 +SectorOf512Bytes        equ     0               ; -12 bytes
    4.14 +CheckAttrib             equ     0               ; +16/18 bytes
    4.15  WaitForKey              equ     0               ; +5 bytes
    4.16  TfatSupport             equ     1               ; +10 bytes
    4.17  CheckLBAsupport         equ     0               ; +11/21 bytes
     5.1 --- a/ddd/receipt	Fri May 12 21:18:30 2023 +0100
     5.2 +++ b/ddd/receipt	Fri May 12 21:35:09 2023 +0000
     5.3 @@ -8,7 +8,8 @@
     5.4  LICENSE="GPL3"
     5.5  TARBALL="$PACKAGE-$VERSION.tar.gz"
     5.6  WEB_SITE="http://www.gnu.org/software/ddd/"
     5.7 -WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
     5.8 +#WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
     5.9 +WGET_URL="https://fossies.org/linux/misc/old/$TARBALL"
    5.10  TAGS="debugger"
    5.11  
    5.12  DEPENDS="glibc-base gcc-lib-base ncurses freetype zlib util-linux-uuid \
    5.13 @@ -19,7 +20,7 @@
    5.14  # What is the latest version available today?
    5.15  current_version()
    5.16  {
    5.17 -	wget -O - ${WGET_URL%/*} 2>/dev/null | \
    5.18 +	wget -O - $GNU_MIRROR/$PACKAGE/ 2>/dev/null | \
    5.19  	sed "/latest/d;/$PACKAGE-/!d;/tar/!d;s|.*$PACKAGE-\\(.*\\).tar.*\".*|\\1|" | sort -Vr | sed q
    5.20  }
    5.21  
     6.1 --- a/qbittorrent/receipt	Fri May 12 21:18:30 2023 +0100
     6.2 +++ b/qbittorrent/receipt	Fri May 12 21:35:09 2023 +0000
     6.3 @@ -6,7 +6,7 @@
     6.4  SHORT_DESC="A BitTorrent client in Qt4."
     6.5  MAINTAINER="al.bobylev@gmail.com"
     6.6  LICENSE="GPL2"
     6.7 -WEB_SITE="https://www.qbittorrent.org/"
     6.8 +WEB_SITE="https://github.com/qbittorrent/qBittorrent"
     6.9  
    6.10  TARBALL="$PACKAGE-$VERSION.tar.xz"
    6.11  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
     7.1 --- a/xinput-calibrator/receipt	Fri May 12 21:18:30 2023 +0100
     7.2 +++ b/xinput-calibrator/receipt	Fri May 12 21:35:09 2023 +0000
     7.3 @@ -9,7 +9,7 @@
     7.4  SOURCE="xinput_calibrator"
     7.5  TARBALL="$SOURCE-$VERSION.tar.gz"
     7.6  WEB_SITE="https://www.freedesktop.org/wiki/Software/xinput_calibrator/"
     7.7 -WGET_URL="https://github.com/downloads/tias/xinput_calibrator/$TARBALL"
     7.8 +WGET_URL="https://github.com/tias/xinput_calibrator/archive/refs/tags/v$SOURCE.tar.gz"
     7.9  HOST_ARCH="i486 arm"
    7.10  
    7.11  DEPENDS="xorg-libX11"