Changeset 635 in xtideuniversalbios


Ignore:
Timestamp:
Dec 28, 2025, 2:55:06 AM (12 days ago)
Author:
Krister Nordvall
Message:

Changes:

  • Fixed a bug from r633 where I forgot to add a device type string to the boot menu for the Juko D16-X controller.
  • A minor optimization to BootMenuPrintCfg.asm.
Location:
trunk/XTIDE_Universal_BIOS
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/XTIDE_Universal_BIOS/Inc/Revision.inc

    r634 r635  
    1 634
     1635

  • trunk/XTIDE_Universal_BIOS/Src/Menus/BootMenu/BootMenuPrintCfg.asm

    r601 r635  
    99;
    1010; XTIDE Universal BIOS and Associated Tools
    11 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
     11; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2025 by XTIDE Universal BIOS Team.
    1212;
    1313; This program is free software; you can redistribute it and/or modify
    … …  
    138138;--------------------------------------------------------------------
    139139.PushIRQ:
     140%ifdef MODULE_IRQ
    140141    mov     al, [cs:bx+IDEVARS.bIRQ]
    141142    cbw
     143%else
     144    xor     ax, ax
     145%endif
    142146    push    ax
    143147    ; Fall to .PushResetStatus

  • trunk/XTIDE_Universal_BIOS/Src/Strings.asm

    r603 r635  
    44;
    55; XTIDE Universal BIOS and Associated Tools
    6 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
     6; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2025 by XTIDE Universal BIOS Team.
    77;
    88; This program is free software; you can redistribute it and/or modify
    … …  
    144144%ifdef MODULE_8BIT_IDE OR MODULE_8BIT_IDE_ADVANCED OR MODULE_SERIAL
    145145g_szDeviceTypeValues_8bit:              db  "  8",NULL
     146g_szDeviceTypeValues_JukoD16X:          db  "J16",NULL
    146147g_szDeviceTypeValues_XTIDEr1:           db  "D8 ",NULL  ; Dual 8-bit
    147148g_szDeviceTypeValues_XTIDEr2:           db  "X8 ",NULL  ; A0<->A3 swapped 8-bit
    … …  
    185186        %error "g_szDeviceTypeValues Displacement Incorrect 3"
    186187    %endif
    187     %if g_szDeviceTypeValues_XTIDEr1 <> g_szDeviceTypeValues_8bit + g_szDeviceTypeValues_Displacement
     188    %if g_szDeviceTypeValues_JukoD16X <> g_szDeviceTypeValues_8bit + g_szDeviceTypeValues_Displacement
    188189        %error "g_szDeviceTypeValues Displacement Incorrect 4"
    189190    %endif
     191    %if g_szDeviceTypeValues_XTIDEr1 <> g_szDeviceTypeValues_JukoD16X + g_szDeviceTypeValues_Displacement
     192        %error "g_szDeviceTypeValues Displacement Incorrect 5"
     193    %endif
    190194    %if g_szDeviceTypeValues_XTIDEr2 <> g_szDeviceTypeValues_XTIDEr1 + g_szDeviceTypeValues_Displacement
    191         %error "g_szDeviceTypeValues Displacement Incorrect 5"
     195        %error "g_szDeviceTypeValues Displacement Incorrect 6"
    192196    %endif
    193197    %if g_szDeviceTypeValues_XTIDEr2_Olivetti <> g_szDeviceTypeValues_XTIDEr2 + g_szDeviceTypeValues_Displacement
    194         %error "g_szDeviceTypeValues Displacement Incorrect 6"
     198        %error "g_szDeviceTypeValues Displacement Incorrect 7"
    195199    %endif
    196200
    … …  
    198202
    199203    %if g_szDeviceTypeValues_XTCFpio8 <> g_szDeviceTypeValues_XTIDEr2_Olivetti + g_szDeviceTypeValues_Displacement
    200         %error "g_szDeviceTypeValues Displacement Incorrect 7"
     204        %error "g_szDeviceTypeValues Displacement Incorrect 8"
    201205    %endif
    202206    %if g_szDeviceTypeValues_XTCFpio8BIU <> g_szDeviceTypeValues_XTCFpio8 + g_szDeviceTypeValues_Displacement
    203         %error "g_szDeviceTypeValues Displacement Incorrect 8"
     207        %error "g_szDeviceTypeValues Displacement Incorrect 9"
    204208    %endif
    205209    %if g_szDeviceTypeValues_XTCFpio16BIU <> g_szDeviceTypeValues_XTCFpio8BIU + g_szDeviceTypeValues_Displacement
    206         %error "g_szDeviceTypeValues Displacement Incorrect 9"
     210        %error "g_szDeviceTypeValues Displacement Incorrect 10"
    207211    %endif
    208212    %if g_szDeviceTypeValues_XTCFdma <> g_szDeviceTypeValues_XTCFpio16BIU + g_szDeviceTypeValues_Displacement
    209         %error "g_szDeviceTypeValues Displacement Incorrect 10"
     213        %error "g_szDeviceTypeValues Displacement Incorrect 11"
    210214    %endif
    211215    %if g_szDeviceTypeValues_JrIde <> g_szDeviceTypeValues_XTCFdma + g_szDeviceTypeValues_Displacement
    212         %error "g_szDeviceTypeValues Displacement Incorrect 11"
     216        %error "g_szDeviceTypeValues Displacement Incorrect 12"
    213217    %endif
    214218    %if g_szDeviceTypeValues_ADP50L <> g_szDeviceTypeValues_JrIde + g_szDeviceTypeValues_Displacement
    215         %error "g_szDeviceTypeValues Displacement Incorrect 12"
     219        %error "g_szDeviceTypeValues Displacement Incorrect 13"
    216220    %endif
    217221
    … …  
    219223
    220224    %if g_szDeviceTypeValues_Serial <> g_szDeviceTypeValues_ADP50L + g_szDeviceTypeValues_Displacement
    221         %error "g_szDeviceTypeValues Displacement Incorrect 13"
     225        %error "g_szDeviceTypeValues Displacement Incorrect 14"
    222226    %endif
    223227

  • trunk/XTIDE_Universal_BIOS/Src/StringsCompressed.asm

    r603 r635  
    1414;
    1515; XTIDE Universal BIOS and Associated Tools
    16 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
     16; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2025 by XTIDE Universal BIOS Team.
    1717;
    1818; This program is free software; you can redistribute it and/or modify
    … …  
    271271                                          db     20h,  20h,  10h          ; compressed
    272272
     273g_szDeviceTypeValues_JukoD16X:          ; db    "J16",NULL
     274                                        ; db     4ah,  31h,  36h,  00h    ; uncompressed
     275                                          db     50h,  2bh,  0fh          ; compressed
     276
    273277g_szDeviceTypeValues_XTIDEr1:           ; db    "D8 ",NULL  ; Dual 8-bit
    274278                                        ; db     44h,  38h,  20h,  00h    ; uncompressed
    … …  
    342346%error "g_szDeviceTypeValues Displacement Incorrect 3"
    343347%endif
    344 %if g_szDeviceTypeValues_XTIDEr1 <> g_szDeviceTypeValues_8bit + g_szDeviceTypeValues_Displacement
     348%if g_szDeviceTypeValues_JukoD16X <> g_szDeviceTypeValues_8bit + g_szDeviceTypeValues_Displacement
    345349%error "g_szDeviceTypeValues Displacement Incorrect 4"
    346350%endif
     351%if g_szDeviceTypeValues_XTIDEr1 <> g_szDeviceTypeValues_JukoD16X + g_szDeviceTypeValues_Displacement
     352%error "g_szDeviceTypeValues Displacement Incorrect 5"
     353%endif
    347354%if g_szDeviceTypeValues_XTIDEr2 <> g_szDeviceTypeValues_XTIDEr1 + g_szDeviceTypeValues_Displacement
    348 %error "g_szDeviceTypeValues Displacement Incorrect 5"
     355%error "g_szDeviceTypeValues Displacement Incorrect 6"
    349356%endif
    350357%if g_szDeviceTypeValues_XTIDEr2_Olivetti <> g_szDeviceTypeValues_XTIDEr2 + g_szDeviceTypeValues_Displacement
    351 %error "g_szDeviceTypeValues Displacement Incorrect 6"
     358%error "g_szDeviceTypeValues Displacement Incorrect 7"
    352359%endif
    353360
    … …  
    355362
    356363%if g_szDeviceTypeValues_XTCFpio8 <> g_szDeviceTypeValues_XTIDEr2_Olivetti + g_szDeviceTypeValues_Displacement
    357 %error "g_szDeviceTypeValues Displacement Incorrect 7"
     364%error "g_szDeviceTypeValues Displacement Incorrect 8"
    358365%endif
    359366%if g_szDeviceTypeValues_XTCFpio8BIU <> g_szDeviceTypeValues_XTCFpio8 + g_szDeviceTypeValues_Displacement
    360 %error "g_szDeviceTypeValues Displacement Incorrect 8"
     367%error "g_szDeviceTypeValues Displacement Incorrect 9"
    361368%endif
    362369%if g_szDeviceTypeValues_XTCFpio16BIU <> g_szDeviceTypeValues_XTCFpio8BIU + g_szDeviceTypeValues_Displacement
    363 %error "g_szDeviceTypeValues Displacement Incorrect 9"
     370%error "g_szDeviceTypeValues Displacement Incorrect 10"
    364371%endif
    365372%if g_szDeviceTypeValues_XTCFdma <> g_szDeviceTypeValues_XTCFpio16BIU + g_szDeviceTypeValues_Displacement
    366 %error "g_szDeviceTypeValues Displacement Incorrect 10"
     373%error "g_szDeviceTypeValues Displacement Incorrect 11"
    367374%endif
    368375%if g_szDeviceTypeValues_JrIde <> g_szDeviceTypeValues_XTCFdma + g_szDeviceTypeValues_Displacement
    369 %error "g_szDeviceTypeValues Displacement Incorrect 11"
     376%error "g_szDeviceTypeValues Displacement Incorrect 12"
    370377%endif
    371378%if g_szDeviceTypeValues_ADP50L <> g_szDeviceTypeValues_JrIde + g_szDeviceTypeValues_Displacement
    372 %error "g_szDeviceTypeValues Displacement Incorrect 12"
     379%error "g_szDeviceTypeValues Displacement Incorrect 13"
    373380%endif
    374381
    … …  
    376383
    377384%if g_szDeviceTypeValues_Serial <> g_szDeviceTypeValues_ADP50L + g_szDeviceTypeValues_Displacement
    378 %error "g_szDeviceTypeValues Displacement Incorrect 13"
     385%error "g_szDeviceTypeValues Displacement Incorrect 14"
    379386%endif
    380387
    … …  
    608615
    609616;; translated usage stats
     617;; 56:9
     618;; 48:2
     619;; 32:34
     620;; 34:3
     621;; 33:1
     622;; 49:3
     623;; 47:2
     624;; 172:2
     625;; 53:2
     626;; 54:3
     627;; 45:2
     628;; 179:8
     629;; 46:3
     630;; 51:3
     631;; 171:2
     632;; 50:2
    610633;; 181:1
    611 ;; 48:2
    612 ;; 172:2
    613 ;; 50:2
    614 ;; 171:2
    615 ;; 45:2
    616 ;; 51:3
    617634;; 200:1
    618 ;; 34:3
    619 ;; 179:8
    620 ;; 33:1
    621 ;; 53:2
    622 ;; 47:2
    623 ;; 54:2
    624 ;; 46:3
    625 ;; 32:34
    626 ;; 56:9
    627635;; 175:1
    628 ;; 49:2
    629636;; 44:1
    630637;; total translated: 20
    631638
    632639;; format usage stats
     640;; u:6
     641;; 2-I:1
     642;; 5-u:2
     643;; z:2
     644;; nl:12
    633645;; 5-x:1
    634646;; s:14
    635 ;; z:2
    636 ;; u:6
    637 ;; 2-u:1
    638 ;; nl:12
    639 ;; 2-I:1
    640 ;; c:13
    641 ;; 5-u:2
    642647;; x:5
    643648;; A:4
     649;; 2-u:1
     650;; c:13
    644651;; total format: 11
    645652
    … …  
    661668;; 72,H:2
    662669;; 73,I:1
    663 ;; 74,J:
     670;; 74,J:1
    664671;; 75,K:1
    665672;; 76,L:4
    … …  
    709716;; 120,x:
    710717;; 121,y:2
    711 ;; alphabet used count: 45
     718;; alphabet used count: 46
    712719%endif ; STRINGSCOMPRESSED_TABLES
    713720
Note: See TracChangeset for help on using the changeset viewer.