Browse Source

Merge pull request #41 from b1ackmai1er/master

Fix for usb-fifo boot display
pull/48/head
Wayne Warthen 7 years ago
committed by GitHub
parent
commit
49b2255020
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      Source/HBIOS/dsrtc.asm
  2. 3
      Source/HBIOS/hbios.asm
  3. 15
      Source/HBIOS/uf.asm

11
Source/HBIOS/dsrtc.asm

@ -95,6 +95,15 @@ DSRTC_CE .EQU %00010000 ; BIT 4 IS CHIP ENABLE (CE)
DSRTC_MASK .EQU %11110000 ; MASK FOR BITS WE OWN IN RTC LATCH PORT
DSRTC_IDLE .EQU %00100000 ; QUIESCENT STATE
;
; VALUES FOR DIFFERENT BATTERY OR SUPERCAPACITOR CHARGE RATES
;
DS1d2k .EQU %10100101 ; 1 DIODE 2K RESISTOR (DEFAULT)
DS1d4k .EQU %10100110 ; 1 DIODE 4K RESISTOR
DS1d8k .EQU %10100111 ; 1 DOIDE 8K RESISTOR
DS2d2k .EQU %10101001 ; 2 DIODES 2K RESISTOR
DS2d4k .EQU %10101010 ; 2 DIODES 4K RESISTOR
DS2d8k .EQU %10101011 ; 2 DIODES 8K RESISTOR
;
#ENDIF
;
#IF (DSRTCMODE == DSRTCMODE_MFPIC)
@ -161,7 +170,7 @@ DSRTC_INIT1:
LD E,$90 ; ACCESS CHARGE REGISTER
CALL DSRTC_CMD ;
LD E,$A5 ; STD CHARGE VALUES
LD E,DS1d2k ; STD CHARGE VALUES
CALL DSRTC_PUT ;
CALL DSRTC_END ; FINISH REG WRITE

3
Source/HBIOS/hbios.asm

@ -3550,7 +3550,7 @@ PS_FLPED .TEXT "ED$"
;
PS_SDSTRREF:
.DW PS_SDUART, PS_SDASCI, PS_SDTERM,
.DW PS_SDPRPCON, PS_SDPPPCON, PS_SDSIO, PS_SDACIA, PS_SDPIO
.DW PS_SDPRPCON, PS_SDPPPCON, PS_SDSIO, PS_SDACIA, PS_SDPIO,PS_SDUF
;
PS_SDUART .TEXT "UART$"
PS_SDASCI .TEXT "ASCI$"
@ -3560,6 +3560,7 @@ PS_SDPPPCON .TEXT "PPPCON$"
PS_SDSIO .TEXT "SIO$"
PS_SDACIA .TEXT "ACIA$"
PS_SDPIO .TEXT "PORT$"
PS_SDUF .TEXT "UF$"
;
; SERIAL TYPE STRINGS
;

15
Source/HBIOS/uf.asm

@ -4,7 +4,7 @@
; PHIL SUMMERS (b1ackmai1er)
;==================================================================================================
;
; BASE PORT IS SET IN PLT_SBC.INC
; BASE PORT IS SET IN CFG_SBC.INC
; INTERRUPTS ARE NOT USED.
; ONLY ONE BOARD SUPPORTED.
;
@ -60,10 +60,11 @@ UF_INIT:
PRTS("IO=0x$")
LD A,UFBASE ; PRINT PORT
CALL PRTHEXBYTE
LD A,(UF_USB_ACTIVE) ; PRINT CABLE STATUS
OR A
RET NZ
PRTS(" No Cable$")
LD A,(UF_USB_ACTIVE) ; PRINT CONNECTION STATUS
OR A ; REQUIRES TERMINAL PROGRAM
RET NZ ; TO HAVE INITIALIZED PORT
PRTS(" No $") ; ON PC SIDE.
PRTS("connection$")
RET
;
; INPUT A CHARACTER AND RETURN IT IN E
@ -161,9 +162,9 @@ UF_DETECT:
IN A,(FIFO_STATUS)
AND 10000001B
SUB 10000001B ; A=0 CABLE DISCONNECTED
RET Z
RET Z ; OR PC PORT CLOSED
LD A,1 ; A=1 CABLE CONNECTED
RET
RET ; AND PC PORT OPEN
;
; DRIVER FUNCTION TABLE
;

Loading…
Cancel
Save