The spans do now contain the size of a span, no longer the end offset.

[cc65] / libsrc / atari / ostype.s

diff --git a/libsrc/atari/ostype.s b/libsrc/atari/ostype.s
index 7975c8b3c7cd8b23b1ff66a262af7e8c9e28bfb6..86e88811dc9b2e69cb5e66f1174932a9d54eda19 100644 (file)
--- a/libsrc/atari/ostype.s
+++ b/libsrc/atari/ostype.s
@@ -1,15 +1,14 @@
 ;
-; Christian Groessler, July 2000
+; Christian Groessler, July 2004
 ; from Freddy Offenga's rominfo.c
 ;
-; unsigned int get_ostype(void)
+; unsigned char get_ostype(void)
 ;
-; x x x x x x x x  x x x x x x x x   - 16 bit flag
-; | | | | | | | |  | | | | | | | |
-; | | | | | | | |  | | | | | +-+-+-- main OS rev.
-; | | | | | | | |  | | | +-+-------- PAL/NTSC flag
-; | | | | | | | |  +-+-+------------ minor OS rev.
-; +-+-+-+-+-+-+-+------------------- unused
+; x x x x x x x x   -  8 bit flag
+; | | | | | | | |
+; | | | | | +-+-+-- main OS rev.
+; | | +-+-+-------- minor OS rev.
+; +-+-------------- unused
 ;
 ; main OS rev.:
 ;      000 - unknown
@@ -17,17 +16,14 @@
 ;      010 - 1200XL ROM
 ;      011 - XL/XE ROM
 ;      1xx - unassigned
-; PAL/NTSC flag:
-;      00 - unknown
-;      01 - PAL
-;      10 - NTSC
-;      11 - (invalid)
 ; minor OS rev.: (depending on main OS rev.);
 ;      400/800:
 ;              000 - unknown
-;              001 - Rev. A
-;              010 - Rev. B
-;              011 - unassigned (up to 111)
+;              001 - Rev. A PAL
+;              010 - Rev. B PAL
+;              011 - Rev. A NTSC
+;              100 - Rev. B NTSC
+;              101 - unassigned (up to 111)
 ;      1200XL:
 ;              000 - unknown
 ;              001 - Rev. 10
@@ -42,8 +38,6 @@
 ;              101 - unassigned (up to 111)
 ;
 
-
-       .include        "atari.inc"
        .export         _get_ostype
 
 .proc  _get_ostype
@@ -66,8 +60,7 @@
        asl     a
        asl     a
        asl     a
-       asl     a
-       asl     a
+       and     #%00111000
        ora     #%11
 _fin:  ldx     #0
        rts
@@ -91,11 +84,11 @@ _1200xl:
        beq     _1200_fin
 
 _1200_10:
-       lda     #%00100000
+       lda     #%00001000
        bne     _1200_fin
 
 _1200_11:
-       lda     #%01000000
+       lda     #%00010000
 
 _1200_fin:
        ora     #%010
@@ -113,14 +106,14 @@ _400800:
 
 ; 400/800 NTSC Rev. A
 
-       lda     #%00110001
-       bne     _400800_done
+       lda     #%00011001
+       bne     _fin
 
-; 400/900 unknown
+; 400/800 unknown
 
 _400800_unknown:
        lda     #%00000001
-       bne     _400800_done
+       bne     _fin
 
 _400800_1:
        cmp     #$d6
@@ -130,8 +123,8 @@ _400800_1:
 
 ; 400/800 PAL Rev. A
 
-       lda     #%00101001
-       bne     _400800_done
+       lda     #%00001001
+       bne     _fin
 
 _400800_2:
        cmp     #$f3
@@ -141,8 +134,8 @@ _400800_2:
 
 ; 400/800 NTSC Rev. B
 
-       lda     #%01010001
-       bne     _400800_done
+       lda     #%00100001
+       bne     _fin
 
 _400800_3:
 
@@ -153,9 +146,7 @@ _400800_3:
 
 ; 400/800 PAL Rev. B
 
-       lda     #%01001001
-
-_400800_done:
+       lda     #%00010001
        bne     _fin
 
 .endproc