Changeset 47

Timestamp:

10/10/09 03:20:47 (3 years ago)

Author:

brandonlw

Message:

I'm reaching a point where I really need to be adding oncalc debugging tools, so I guess I'll start working on the system monitor and a basic menu system, rebuilding the APPS and PRGM menus to start with.
From there I can get a Calcsys-style hex editor in there and oncalc usb8x/USBTools-style logging.
Heck, maybe I can even transfer Calcsys TO it and execute at least part of it.
It's a lot of work and kind of off-track, but it's the only way I'm going to diagnose the dual booting and linking problems.

Location:

trunk

Files:

• OS2.zws (modified) (1 diff)
• extras/dumpmem.z80 (modified) (2 diffs)
• includes/os2.inc (modified) (2 diffs)
• page00/boot.asm (modified) (5 diffs)
• page00/display.asm (modified) (4 diffs)
• page00/home.asm (modified) (2 diffs)
• page00/intmisc.asm (modified) (2 diffs)
• page00/menu.asm (added)
• page00/util.asm (modified) (2 diffs)
• page01/01base.asm (modified) (2 diffs)
• page1C/linklow.asm (modified) (1 diff)
• page1C/silentlink.asm (modified) (4 diffs)
• page1D/1Dbase.asm (modified) (2 diffs)

trunk/OS2.zws

@@ -44 +44 @@
 SOURCE = page00\util.asm
 SOURCE = page00\home.asm
+SOURCE = page00\menu.asm
 SOURCE = page00\jumptable.asm
 SOURCE = page01\01base.asm

trunk/extras/dumpmem.z80

@@ -33 +33 @@
         pop bc
         pop de
+        jr nc,noErrorDetected
+        ld a,(myPage)
+        push de
+        push bc
+        push hl
+        call GetSmallDump
+        pop hl
+        pop bc
+        pop de
         jr c,errorDetected
+noErrorDetected:
         add hl,bc
         ex de,hl
@@ -87 +97 @@
         bcall(_RecAByteIO)
         bcall(_SendAck)
+        call APP_POP_ERRORH
         xor a
         jr getDumpDone

trunk/includes/os2.inc

@@ -30 +30 @@
 _PutS                       EQU 450Ah
 _ClrLCDFull                 EQU 4540h
+_ClrScrnFull                EQU 4546h
+_ClrTxtShd                  EQU 454Ch
 _CursorOff                  EQU 45BEh
 _hideCursor                 EQU 45C1h
@@ -93 +95 @@
 iMathPtr4                   EQU    84D9h
 iMathPtr5                   EQU    84DBh
+;
+textShadow                  EQU    8508h
 ;
 cxMain                      EQU    858Dh

trunk/page00/boot.asm

@@ -11 +11 @@
  EXTERN outputPage,NZIf83Plus,_ZERO_PORT_3,_OUT_PORT_3,AnimateRunIndicator,PowerOff
  EXTERN DispHexA,DispHexHL,IPutC,ReadKeyboardKey,ReadKeypad,ClrLCDFull
- EXTERN curBlink,resetAPDTimer,UpdateAPD,BCALL,BJUMP,CopyRAMToFlashPage
+ EXTERN curBlink,resetAPDTimer,UpdateAPD,BCALL,BJUMP,CopyRAMToFlashPage,cphlde,CalculateOSChecksum
  EXTERN _HandleDefaultUSBInterrupt,_ReadUSBInterruptData,_HandleUSBInterruptInitialize,CopyToRAMPage
  EXTERN _HandleUSBACablePluggedIn,_HandleUSBACableUnplugged,_HandleUSBBCablePluggedIn,_HandleUSBBCableUnplugged
- EXTERN GetHexA,GetHexHL,CursorOff,RunIndicOn,SetFastSpeed,CanAlph,homescreenContextVectors,SetContrast
+ EXTERN GetHexA,GetHexHL,CursorOff,RunIndicOn,SetFastSpeed,CanAlph,homescreenContextVectors,SetContrast,_PULLDOWNCHK
 
 ;0000h:
@@ -438 +438 @@
        ld sp,0FFC5h
        ld iy,flags
+       B_CALL ClrScrnFull
        ;Do any other initialization
        ;Appear "off"
@@ -474 +475 @@
        res receiveTIOS,(iy+linkFlags2)
 ;Start the OS, minimal as it is
+       call CalculateOSChecksum
+       ld de,(RAMChecksum)
+       call cphlde
+       jr z,$F
+       ;The RAM checksum check has failed, so wipe out RAM and hope for the best
+       ;TODO: figure out what this actually needs to do
+;       ld hl,appData
+;       ld de,appData+1
+;       ld bc,7FFFh
+;       ld (hl),0
+;       ldir
+;       jp 0000h
+$$:    ;Screw up the RAM checksum so it's no longer valid
+       dec de
+       ld (RAMChecksum),de
        call ClrLCDFull
        res indicOnly,(iy+indicFlags)
@@ -507 +523 @@
        call APP_PUSH_ERRORH
        ld (onSP),sp
+RestartMon:
 _Mon:  xor a
        ld (kbdKey),a
@@ -515 +532 @@
        call CursorOff
        call RunIndicOn
+       call _PULLDOWNCHK
+       jr c,RestartMon
        call CallcxMain
        jr _Mon

trunk/page00/display.asm

@@ -3 +3 @@
 
  PUBLIC AnimateRunIndicator,DispHexA,PutS,PutC,curBlink,SaveOScreen,DispHexHL,EraseEOL,ClrLCDFull
- PUBLIC _LCD_COMMAND,SetXAutoIncrementMode,SetYAutoIncrementMode,IPutSB,PutMap
+ PUBLIC _LCD_COMMAND,SetXAutoIncrementMode,SetYAutoIncrementMode,IPutSB,PutMap,ClrScrnFull,ClrTxtShd
  PUBLIC saveTR,restoreTR,showCursor,CursorOff,CursorOn,hideCursor,RunIndicOn,IPutC
- EXTERN IsAtEditTail,IsAtBtm,LCDDelay
+ EXTERN IsAtEditTail,IsAtBtm,LCDDelay,ATimes16
 
  include "includes\os2.inc"
@@ -16 +16 @@
 CursorOn:
 ;TODO: come back to these...
+       ret
+
+ClrScrnFull:
+       call ClrLCDFull
+ClrTxtShd:
+       bit appTextSave,(iy+appFlags)
+       ret z
+       ld hl,textShadow
+       ld (hl),' '
+       ld de,textShadow+1
+       ld bc,127
+       ldir
        ret
 
@@ -229 +241 @@
 ;TODO: get this using a built-in font table instead of this boot code hack
 PutC:
-       ld b,a
+       push af
+       push bc
+       push de
+       push hl
+       push ix
+       bit appTextSave,(iy+appFlags)
+       jr z,$F
+       call GetTextShadowOffset
+       ld (hl),a
+$$:    ld b,a
        in a,(6)
        push af
@@ -265 +286 @@
        ld a,b
        out (6),a
+       pop ix
+       pop hl
+       pop de
+       pop bc
+       pop af
+       ret
+GetTextShadowOffset:
+       push af
+       push bc
+       push de
+       ld hl,(curRow)
+       ld a,l
+       call ATimes16
+       add a,h
+       ld l,a
+       ld h,0
+       ld de,textShadow
+       add hl,de
+       pop de
+       pop bc
+       pop af
        ret
 

trunk/page00/home.asm

@@ -26 +26 @@
        pop hl
        ld (curRow),hl
-       cp kGraph
-       jr z,graphPressed
        cp kYequ
        ret nz
@@ -62 +60 @@
        set curAble,(iy+curFlags)
        ret
-graphPressed:
-       B_CALL UnlockFlash
-       ld a,70h
-       ld b,0
-       ld de,7FFFh
-       B_CALL WriteAByte
-       ret
+

trunk/page00/intmisc.asm

@@ -5 +5 @@
 
  PUBLIC CheckLowBatteriesTurnOff,_ZERO_PORT_3,_OUT_PORT_3,PowerOff,UpdateAPD,resetAPDTimer
- EXTERN SaveOScreen,LCDDelay
+ EXTERN SaveOScreen,LCDDelay,CalculateOSChecksum
 
 PowerOff:
@@ -16 +16 @@
        call LCDDelay
        out (LCDinstPort),a
+       call CalculateOSChecksum
+       ld (RAMChecksum),hl
        ld a,STATE_MODE0_DEFAULT
        out (interruptStatusPort),a

trunk/page00/util.asm

@@ -3 +3 @@
 
  PUBLIC _APP_PUSH_ERRORH,_APP_POP_ERRORH,FindSym,PushRealO1,Mov9ToOP1,FPAdd,OP1ToOP2,LCDDelay
- PUBLIC CopyFlashPage
+ PUBLIC CopyFlashPage,ATimes16,CalculateOSChecksum
  PUBLIC Placeholder005Fh,Placeholder0006h,Placeholder004Eh,Placeholder0003h,Placeholder0035h
  PUBLIC outputPage,NZIf83Plus,ZIfSlowSpeed,GetBytePaged,MakeOffPageCall,CopyToRAMPage
- PUBLIC CopyRAMToFlashPage,CanAlphIns,CanAlph,ResAlph,GetHexA,GetHexHL,SetFastSpeed
+ PUBLIC CopyRAMToFlashPage,CanAlphIns,CanAlph,ResAlph,GetHexA,GetHexHL,SetFastSpeed,cphlde
  PUBLIC BCALL,BJUMP,JErrorNo,SetupPagedPtr,PagedGet,EraseRAMPage,SetContrast,MemClear
  EXTERN Page0Call,UpdateAPD,PowerOff,GetCSC,PutC,DispHexHL,PutMap,BCALLRoutine,OS2Marker
@@ -22 +22 @@
 Placeholder004Eh:
 Placeholder005Fh:
+       ret
+
+cphlde:
+       push hl
+       or a
+       sbc hl,de
+       pop hl
+       ret
+
+ATimes16:
+       add a,a
+       add a,a
+       add a,a
+       add a,a
+       ret
+
+CalculateOSChecksum:
+       push ix
+       ld ix,userMem
+       ld bc,0FE70h-userMem
+       ld hl,0011h
+       ld d,h
+$$:    ld e,(ix+0)
+       inc ix
+       add hl,de
+       dec bc
+       ld a,b
+       or c
+       jr nz,$B
+       ld e,d
+       ex de,hl
+       sbc hl,de
+       pop ix
        ret
 

trunk/page01/01base.asm

@@ -12 +12 @@
        and STATUS_NON_83P_MASK
        jr z,GetKeyStart
-       set linkAssistEnabled,(iy+linkAssistFlags)
-       in a,(laStatusPort)
-       xor a
-       out (laEnPort),a
+       ;set linkAssistEnabled,(iy+linkAssistFlags)
+       ;in a,(laStatusPort)
+       ;xor a
+       ;out (laEnPort),a
        bit 0,(iy+3Eh)
        jr z,disableLA
@@ -68 +68 @@
        jr GetKeyMainLoop
 receivingData:
+       ld hl,kbdKey
+       ld (hl),0
        B_CALL keyscnlnk
+;       res indicOnly,(iy+indicFlags)      ;***TESTING
        ld a,(kbdKey)
        or a

trunk/page1C/linklow.asm

@@ -140 +140 @@
        jr nz,cgbNoAssist
        di
-       jr ReceiveLAByteToC
+       call ReceiveLAByteToC
+       ld a,c
+       ret
 cgbNoAssist:
        ld b,8

trunk/page1C/silentlink.asm

@@ -11 +11 @@
  EXTERN SetYAutoIncrementMode,SendContinue,ReceiveDataPacket,DispHexHL,PutC,receiveRestOfDataPacket
  EXTERN CopyToRAMPage,CopyRAMToFlashPage,EraseEOL,PowerOff,SendHCommand,IPutSB,IPutC,CheckForBootLoader
- EXTERN SetupPagedPtr,PagedGet,SendChecksumGetAcknowledge
+ EXTERN SetupPagedPtr,PagedGet,SendChecksumGetAcknowledge,RecAByteIO
 
 keyscnlnk:
@@ -40 +40 @@
        ld a,(ioData)
        call ContinueGetByte
+       bit 5,(iy+3Dh)
+       jr nz,keyscnlnkEnd
+       ;HACK: until I figure out where the extra zero's coming from...
        call Get3Bytes
+HandleLinkPacket:
        ld hl,cmdTable
        ld b,(hl)
@@ -110 +114 @@
 
 memoryDumpPacket:
+       ld hl,ioData
+       ld (iMathPtr5),hl
        call receiveRestOfDataPacket
        ld bc,(ioData)
        ld b,c
        ld de,(ioOP1)
+       ld a,b
+       ld hl,0
+       ld (curRow),hl
+       call DispHexA
+       ex de,hl
+       call DispHexHL
+       ex de,hl
        call SetupPagedPtr
        ld de,(ioOP1+2)
        ld (header+2),de
+       push de
        ld hl,1573h
        ld (header),hl
        call Send4Bytes
        ld hl,0
-       ld (checksum),hl
-       ld de,(header+2)
+       ld (header+4),hl
+       pop de
 $$:    push de
        call PagedGet
@@ -135 +149 @@
 
 receivedRequestToSend:
+       ld hl,ioData
+       ld (iMathPtr5),hl
        call receiveRestOfDataPacket
        ld a,(ioOP1)

trunk/page1D/1Dbase.asm

@@ -3 +3 @@
 
  PUBLIC _JErrorNo,_UnlockFlash,_GetKey
- EXTERN JErrorNo,UnlockFlash,GetKey,keyscnlnk,Rec1stByteNC,RecAByteIO,MemClear
- EXTERN ClrLCDFull,PutS,GetCSC,CursorOff,CursorOn,hideCursor,showCursor
+ EXTERN JErrorNo,UnlockFlash,GetKey,keyscnlnk,Rec1stByteNC,RecAByteIO,MemClear,ClrTxtShd
+ EXTERN ClrLCDFull,PutS,GetCSC,CursorOff,CursorOn,hideCursor,showCursor,ClrScrnFull
 
 ;4000h:
@@ -1359 +1359 @@
        DW 0000h
        DB 00h
-;_ClrScrnFull           equ 4546h
-       DW 0000h
+_ClrScrnFull:
+       DW ClrScrnFull
        DB 00h
 ;_ClrScrn               equ 4549h
        DW 0000h
        DB 00h
-;_ClrTxtShd             equ 454Ch
-       DW 0000h
+_ClrTxtShd:
+       DW ClrTxtShd
        DB 00h
 ;_ClrWindow             equ 454Fh