Merge remote-tracking branch 'upstream/master' into cassette

Conflicts:
	asminc/atari.inc
	libsrc/atari/mou/atrst.s

libsrc/atari/joy_stat_stddrv.s

@@ -7,8 +7,16 @@
 ;
 
         .export _joy_static_stddrv
+        .ifdef  __ATARIXL__
+        .import _atrxstd_joy
+        .else
         .import _atrstd_joy
+        .endif
 
 .rodata
 
+        .ifdef  __ATARIXL__
+_joy_static_stddrv := _atrxstd_joy
+        .else
 _joy_static_stddrv := _atrstd_joy
+        .endif

libsrc/atari/joy_stddrv.s

@@ -10,4 +10,9 @@
 
 .rodata
 
-_joy_stddrv:    .asciiz "atrstd.joy"
+_joy_stddrv:
+        .ifdef  __ATARIXL__
+                .asciiz "atrxstd.joy"
+        .else
+                .asciiz "atrstd.joy"
+        .endif

libsrc/atari/mou/atrst.s

@@ -446,6 +446,14 @@ IOCTL:  lda     #<MOUSE_ERR_INV_IOCTL     ; We don't support ioclts for now
 
 IRQ:
 
+; Turn mouse polling IRQ back on in case it disabled itself due to CRITIC
+; flag being set.
+
+        lda     POKMSK
+        ora     #%00000001              ; timer 1 enable
+        sta     POKMSK
+        sta     IRQEN
+
 ; Check for a pressed button and place the result into Buttons
 
         ldx     #0
@@ -514,7 +522,12 @@ IRQ:
 ; T1Han: Local IRQ routine to poll mouse
 ;
 
-T1Han:  tya
+T1Han:  lda     CRITIC                  ; if CRITIC flag is set, disable the
+        bne     disable_me              ; high frequency polling IRQ, in order
+                                        ; not to interfere with SIO I/O (e.g.
+                                        ; floppy access)
+
+        tya
         pha
         txa
         pha
@@ -695,3 +708,22 @@ mmexit: sty     oldval
         pla
         rti
 .endif
+
+
+; Disable the interrupt source which caused us to be called.
+; The interrupt will be enabled again by the "IRQ" routine.
+; The "IRQ" routine, despite its name, is called from the
+; vertical blank NMI interrupt *only* if the CRITIC flag has
+; been cleared.
+
+disable_me:
+        lda     POKMSK
+        and     #%11111110              ; timer 1 disable
+        sta     IRQEN
+        sta     POKMSK
+.ifdef  __ATARIXL__
+        rts
+.else
+        pla
+        rti
+.endif

libsrc/atari/tgi_stat_stddrv.s

@@ -7,8 +7,16 @@
 ;
 
         .export _tgi_static_stddrv
+        .ifdef  __ATARIXL__
+        .import _atrx8_tgi
+        .else
         .import _atr8_tgi
+        .endif
 
 .rodata
 
+        .ifdef  __ATARIXL__
+_tgi_static_stddrv := _atrx8_tgi
+        .else
 _tgi_static_stddrv := _atr8_tgi
+        .endif

libsrc/atari/tgi_stddrv.s

@@ -10,4 +10,9 @@
 
 .rodata
 
-_tgi_stddrv:    .asciiz "atr8.tgi"
+_tgi_stddrv:
+        .ifdef  __ATARIXL__
+                .asciiz "atrx8.tgi"
+        .else
+                .asciiz "atr8.tgi"
+        .endif