Changeset 67


Ignore:
Timestamp:
Oct 11, 2016, 10:42:09 PM (9 years ago)
Author:
Ben Rietbroek
Message:

Replaced some 'eCS' references with generic 'OS/2' [v1.1.1-testing]

With the upcoming ArcaOS, see: ​https://www.arcanoae.com, eComStation
ain't the only game in OS/2-town anymore. So, some references have been
changed to the more generic term 'OS/2' to prevent misinterpretation.

CAUTION:
This is a testbuild !
AirBoot uses the BIOS to access disks and a small coding error can trash
partition tables or other vital disk structures. You are advised to make
backups of TRACK0 and EBRs before using this testbuild. More info at:
​https://rousseaux.github.io/netlabs.air-boot/pdf/AirBoot-v1.1.0-manual.pdf

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/AiR-BOOT.TXT

    r64 r67  
    7373  the drive-letter feature is still needed to force the correct letter on the
    7474  system being booted and hide the others. See the documentation on how to
    75   install multiple eCS systems using the same drive-letter.
     75  install multiple OS/2 systems using the same drive-letter.
    7676
    7777  Another case where the drive-letter feature can still be of value is when
    … …  
    114114- HPFS zero-drive boot-bug (issues #3067 and #3119)
    115115  -------------------------------------------------
    116   AiR-BOOT would sometimes refuse to boot older eCS systems on HPFS.
     116  AiR-BOOT would sometimes refuse to boot older OS/2 systems on HPFS.
    117117  This has been fixed.
    118118
    … …  
    227227- Support for legacy systems on huge disks
    228228  ----------------------------------------
    229   Since it's always best to use the eCS Volume Manager (MiniLVM) to partition
    230   disks that also contain eCS volumes, on huge disks this implies that such
     229  Since it's always best to use the OS/2 Volume Manager (MiniLVM) to partition
     230  disks that also contain OS/2 volumes, on huge disks this implies that such
    231231  volumes have a different alignment due to the special geometry in use.
    232232  With v1.07 support has been added for booting legacy systems like PC-DOS

  • trunk/bootcode/airboot.asm

    r66 r67  
    11821182
    11831183                ;
    1184                 ; BOOKMARK: Check for eCS being installed
    1185                 ; Here we check if eComStation v2.1+ is being installed.
     1184                ; BOOKMARK: Check for OS/2 being installed
     1185                ; Here we check if OS/2 is being installed.
    11861186                ; If so, we forgo the menu and directly boot it.
    11871187                ;
    … …  
    11891189                ; If the first byte of the name of the Install Volume is not 0
    11901190                ; then we potentially have a phase1 boot.
    1191                 test    byte ptr [eCS_InstallVolume],0ffh
     1191                test    byte ptr [OS2_InstallVolume],0ffh
    11921192                ; Nope, so continue normally.
    11931193                jz      MBR_Main_ContinueBoot
    … …  
    12211221
    12221222
    1223                 ; BOOKMARK: Scan for Partitions (Only if eCS install going on)
     1223                ; BOOKMARK: Scan for Partitions (Only if OS/2 install going on)
    12241224                ; Because one or more partitions are possibly added, the
    12251225                ; PartitionXref table is not 'in sync' and could cause the
    … …  
    13051305                ; Save configuration so phase1 boot-through is disabled
    13061306                ; on next boot.
    1307                 mov     byte ptr [eCS_InstallVolume], 0
     1307                mov     byte ptr [OS2_InstallVolume], 0
    13081308                call    DriveIO_SaveConfiguration
    13091309
    … …  
    14401440
    14411441                ; Preload the selected menu-entry
    1442                 ; However, this value will be wrong if eCS phase1 is
     1442                ; However, this value will be wrong if OS/2 phase1 is
    14431443                ; active and the installation partition is newly created.
    14441444                ; See below for the adjustment.
    … …  
    19121912                ; So future config changes will not break auto-install.
    19131913                ;
    1914                 ; BOOKMARK: Name of eCS Installation Volume
     1914                ; BOOKMARK: Name of OS/2 Installation Volume
    19151915                ORIGIN  06D00h
    19161916
    1917 ; SET(A)BOOT stores the volume name of the eCS system being installed here.
     1917; SET(A)BOOT stores the volume name of the OS/2 system being installed here.
    19181918; It is truncated to 11 chars because AiR-BOOT currently does not support
    19191919; longer labelnames. The name is also capitalized.
    1920 ;eCS_InstallVolume       db  12 dup (0)
    1921 ;eCS_InstallVolume       db  'HIGHLOG' ,0
    1922 ;eCS_InstallVolume       db  'ECS-MIDDLE',0,0
    1923 ;eCS_InstallVolume       db  'ECS-HIGH',0,0,0,0
    1924 ;eCS_InstallVolume       db  'ECS-HIGH',0,'NO',0
    1925 ;eCS_InstallVolume       db  'KANWEG2',0
    1926 eCS_InstallVolume       db  0,'NOPHASEONE' ,0
     1920;OS2_InstallVolume       db  12 dup (0)
     1921;OS2_InstallVolume       db  'HIGHLOG' ,0
     1922;OS2_InstallVolume       db  'ECS-MIDDLE',0,0
     1923;OS2_InstallVolume       db  'ECS-HIGH',0,0,0,0
     1924;OS2_InstallVolume       db  'ECS-HIGH',0,'NO',0
     1925;OS2_InstallVolume       db  'KANWEG2',0
     1926OS2_InstallVolume       db  0,'NOPHASEONE' ,0
    19271927
    19281928;

  • trunk/bootcode/airboot.md5

    r65 r67  
    1 93c13f43914d4e9b6497f4011a475601 *airboot.bin
     1fce57015237d051274d5dcf1b84d5293 *airboot.bin

  • trunk/bootcode/regular/driveio.asm

    r57 r67  
    10791079; ------------------------------------------------------
    10801080; Load the master LVM-sector to get the number of sectors per track as
    1081 ; eCS views the drive. If no master LVM-sector is found it is assumed eCS
     1081; OS/2 views the drive. If no master LVM-sector is found it is assumed OS/2
    10821082; is not installed. The master LVM-sector can be located at three different
    10831083; places depending on drive size and partitioning scheme and driver used.
    1084 ; When DANIS506.ADD is used, the eCS extended geometry will be 255/127 for
     1084; When DANIS506.ADD is used, the OS/2 extended geometry will be 255/127 for
    10851085; drives >502GiB but <1TiB. Then the location will be sector 127 which
    10861086; is LBA 126 (7Eh).
    1087 ; IBM1S506.ADD will always use 255/255 for the extended eCS geometry.
     1087; IBM1S506.ADD will always use 255/255 for the extended OS/2 geometry.
    10881088; DANIS506.ADD will use 255/255 for drives >1TiB.
    10891089; Then the location of the master LVM-sector will be 255 which is LBA 254 (FEh).
    1090 ; When eCS is installed on a huge drive that alread had a system on it, eCS
     1090; When OS/2 is installed on a huge drive that alread had a system on it, OS/2
    10911091; will be confined to the lower 502GiB of the drive.
    10921092; In this case the normal geometry from Int13X will be used.
    … …  
    12071207
    12081208; ---------------------------------------------------
    1209 ; Rousseau ## Large drives, (eCS) geometry and LBA ##
     1209; Rousseau ## Large drives, (OS/2) geometry and LBA ##
    12101210; ---------------------------------------------------
    12111211; A sector size of 512 bytes is assumed in the below calculations.

  • trunk/bootcode/regular/other.asm

    r57 r67  
    290290        call    MBR_Teletype
    291291
    292         mov     si, offset eCS_InstallVolume
     292        mov     si, offset OS2_InstallVolume
    293293        mov     al, [si]
    294294        test    al,al                                 ; See if phase 1 is active

  • trunk/bootcode/regular/partmain.asm

    r57 r67  
    787787PART_IsInstallVolume            Proc Near   Uses ax cx dx si di
    788788        cld                                    ; Advance upwards with lodsb
    789         mov   di, offset eCS_InstallVolume     ; Address of install-volume label (max. 11 chars)
     789        mov   di, offset OS2_InstallVolume     ; Address of install-volume label (max. 11 chars)
    790790
    791791        mov   cx, 11                           ; Maximum length of label
    … …  
    967967;~ HELEMAAL NAKIJKEN !
    968968;~ DRIVELETTER ASIGNMENT CORRIGEREN
    969 ;~ WORDT TOCH BOOTDRIVE IN BPB GEZET ALS NON eCS SYSTEEM BOOT ?
     969;~ WORDT TOCH BOOTDRIVE IN BPB GEZET ALS NON-OS/2 SYSTEEM BOOT ?
    970970
    971971
    … …  
    12101210
    12111211
    1212     ; --------------------------------------------------------- OS/2 / eCS I13X
     1212    ; --------------------------------------------------------------- OS/2 I13X
    12131213    ; Now check if the partition to get booted is above 8 GB.
    12141214    ;  If yes, set magic bytes 'I13X' at 3000:0 for boot-loader to recognize.
    … …  
    17351735        ;
    17361736        ; FIXME: PBR Already loaded
    1737        
     1737
    17381738        ; When FAT12/FAT16/HPFS/JFS then boot-drive-letter can be tested
    17391739        ; or adjusted.
    … …  
    18751875
    18761876        ; See if the BPB boot-drive-letter is valid
    1877         ; This one is supposed not to change since eCS cannot be booted
     1877        ; This one is supposed not to change since OS/2 cannot be booted
    18781878        ; from another drive then it was installed on.
    18791879        test    ah,ah
    … …  
    18871887        add     al,3dh
    18881888        mov     bx,[PhysDiskBpbIndex]
    1889         ; Advance to field for drive-letter in BIOS notation (OS/2 - eCS)
     1889        ; Advance to field for drive-letter in BIOS notation (OS/2)
    18901890        inc     bx
    18911891        ; Fix the boot-drive-letter field in the BPB
    … …  
    19011901        ; Also, this field is the culprit of AiR-BOOT v1.07 not handling it
    19021902        ; correctly when the system uses HPFS and this byte is zero.
    1903         ; This mostly involved booting older eCS versions on HPFS.
     1903        ; This mostly involved booting older OS/2 versions on HPFS.
    19041904        ; See issues #3067 and #3119 on http://bugs.ecomstation.nl
    19051905        ;
    … …  
    19561956    no_valid_boot_drive_letter_found:
    19571957        ; HERE SHOULD COME AN ERROR POP-UP ABOUT NO BOOT-DRIVE OR NO LVM-INFO.
    1958         ; WE CONTINUE BOOTING BUT OS/2 - eCS WILL MOST PROBABLY FAIL TO BOOT.
     1958        ; WE CONTINUE BOOTING BUT OS/2 WILL MOST PROBABLY FAIL TO BOOT.
    19591959
    19601960        ; FIXME: Issue some kind of warning
    1961        
     1961
    19621962        ;mov     ah,07h
    19631963        ;mov     si,offset CheckID_MBR
    … …  
    20372037        pop     si
    20382038
    2039        
     2039
    20402040        ; BOOKMARK: Update the CRC of the Partition Boot Record.
    20412041        mov     bx, offset [PBRSector]
    … …  
    20432043        call    DriveIO_SaveConfiguration
    20442044
    2045        
     2045
    20462046        ; Setup the registers for the partition location.
    20472047        mov     ax, wptr [si+LocIPT_AbsoluteBegin+0]
    … …  
    20512051        mov     dl, [si+LocIPT_Drive]
    20522052
    2053        
     2053
    20542054        ; BOOKMARK: Write the adjusted HPFS/JFS PBR to disk.
    20552055        mov     si, offset [PBRSector]
    … …  
    20952095
    20962096
    2097    
     2097
    20982098
    20992099        ;

  • trunk/bootcode/regular/videoio.asm

    r65 r67  
    949949;AutoStartPart     db "Auto Start Partition : ",0
    950950
    951 Phase1            db "eCS Install Phase 1 : ",0
     951Phase1            db "OS/2 Install Phase 1 : ",0
    952952
    953953

  • trunk/bootcode/setup/part_set.asm

    r65 r67  
    127127  PSM_KeyBootAble:
    128128   call    PART_GetPartitionPointer      ; Gets Partition (DL) Pointer -> SI
    129    ; See if this is an eCS LVM Volume.
     129   ; See if this is an OS/2 LVM Volume.
    130130   ; In that case, we don't allow it to be made bootable.
    131131   ; We also show a popup to inform the user.

  • trunk/bootcode/special/lvm.asm

    r57 r67  
    239239        ;
    240240        ; It's a PRI so we use the special locator function.
    241         ; This locator takes care of extended eCS geometry should that be used
     241        ; This locator takes care of extended OS/2 geometry should that be used
    242242        ;
    243243        call    DriveIO_LoadMasterLVMSector
    … …  
    376376        ;
    377377        ; It's a PRI so we use the special locator function.
    378         ; This locator takes care of extended eCS geometry should that be used
     378        ; This locator takes care of extended OS/2 geometry should that be used
    379379        ;
    380380        call    DriveIO_LoadMasterLVMSector

  • trunk/docs/generic/developr.txt

    r57 r67  
    407407
    408408        The boot-drive-letters string is 30-bytes long. One byte per partition.
    409          It's used for OS/2 / eCS use ONLY and it's only definable for HPFS and
     409         It's used for OS/2 use ONLY and it's only definable for HPFS and
    410410         FAT16 partitions. If you enable/disable the driveletter, then YOU are
    411411         required to change the corresponding partition's Drive-Letter flag

  • trunk/install/c/install.c

    r60 r67  
    18451845                    } while (!((UserKey==0x0D) || (UserKey==0x1B)));
    18461846                }
    1847                 if (UserKey==0x0D) {              // ENTER reboots system... (if not in eCS install mode)
     1847                if (UserKey==0x0D) {              // ENTER reboots system... (if not in OS/2 install mode)
    18481848
    18491849                    /*

  • trunk/tools/os2/setaboot/setaboot.c

    r60 r67  
    10001000/*
    10011001// Rousseau: # This is the main entry-point #
    1002 // Special behavior if eCS is booted from CDROM and phase 1 called this program.
     1002// Special behavior if OS/2 is booted from CDROM and phase 1 called this program.
    10031003// In that case, the name of the newly installed system is put in the AiR-BOOT configuration.
    10041004// This will cause AiR-BOOT to boot through after phase 1.
Note: See TracChangeset for help on using the changeset viewer.