Commit 1a0b479e authored by John Ballance's avatar John Ballance
Browse files

Changed debugging to run with DebugIt prior to possible code changes. No...

Changed debugging to run with DebugIt prior to possible code changes.  No actual code changes, so module version not changed.

Detail:
Admin:  built in test tungsten rom. works


Version 1.32. Not tagged
parent 8aaccfbf
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.68.
; Last processed by srccommit version: 1.2.
;
GBLS Module_MajorVersion
GBLA Module_Version
......@@ -14,10 +14,10 @@
Module_MajorVersion SETS "1.32"
Module_Version SETA 132
Module_MinorVersion SETS ""
Module_Date SETS "17 Dec 2002"
Module_ApplicationDate SETS "17-Dec-02"
Module_Date SETS "22 Apr 2005"
Module_ApplicationDate SETS "22-Apr-05"
Module_ComponentName SETS "ATAPI"
Module_ComponentPath SETS "RiscOS/Sources/HWSupport/CD/ATAPI"
Module_FullVersion SETS "1.32"
Module_HelpVersion SETS "1.32 (17 Dec 2002)"
Module_HelpVersion SETS "1.32 (22 Apr 2005)"
END
/* (1.32)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
* Last processed by srccommit version: 1.2.
*
*/
#define Module_MajorVersion_CMHG 1.32
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 17 Dec 2002
#define Module_Date_CMHG 22 Apr 2005
#define Module_MajorVersion "1.32"
#define Module_Version 132
#define Module_MinorVersion ""
#define Module_Date "17 Dec 2002"
#define Module_Date "22 Apr 2005"
#define Module_ApplicationDate "17-Dec-02"
#define Module_ApplicationDate "22-Apr-05"
#define Module_ComponentName "ATAPI"
#define Module_ComponentPath "RiscOS/Sources/HWSupport/CD/ATAPI"
#define Module_FullVersion "1.32"
#define Module_HelpVersion "1.32 (17 Dec 2002)"
#define Module_HelpVersion "1.32 (22 Apr 2005)"
#define Module_LibraryVersionInfo "1:32"
......@@ -169,6 +169,10 @@ $label [ OUTPUT_ON=1
DCB "$string", 0
ALIGN
GRAB r14
|
[ cdebug
CDebug_WriteS $string
]
]
MEND
......
......@@ -194,7 +194,7 @@ full_drive_detection SETL {FALSE}
[ Module_Version > 124
sony_50_id_bodge SETL {TRUE}
mode_select_dont_use_page_d SETL {FALSE}
mode_select_dont_use_page_d SETL {TRUE}
mode_select_ignore_page_d_error SETL {TRUE}
reset_on_drive_error SETL {TRUE}
fix_cr571b10e_maybe SETL {TRUE}
......@@ -293,17 +293,110 @@ full_drive_detection SETL :LNOT: HAL
]
; CSD debug flags
; debug flags
GBLL debug
debug SETL {FALSE}
;debug SETL {TRUE}
GBLL useDebugMacros
useDebugMacros SETL {TRUE}
GBLL cdebug
cdebug SETL {TRUE}
cdebug SETL {FALSE}
cdebug SETL debug
;cdebug SETL {FALSE}
GBLL cdebug2
cdebug2 SETL {FALSE}
cdebug2 SETL debug
;cdebug2 SETL {FALSE}
GBLL cdebug_debugging_all_ops
cdebug_debugging_all_ops SETL {FALSE}
[ cdebug
! 0,"*** This is a debug version ***"
]
[ debug
[ useDebugMacros
XDebugIt_WriteC * &6ba82
MACRO
CDebug_Time
MEND
MACRO
CDebug_NewLine
DLINE "0","",0
MEND
MACRO
CDebug_StrReg8 $str, $reg, $cc
DREG $reg ,"$str", $cc, LongWord
MEND
MACRO
CDebug_StrReg4 $str, $reg, $cc
DREG $reg ,"$str", $cc, Word
MEND
MACRO
CDebug_StrReg2 $str, $reg, $cc
DREG $reg ,"$str", $cc, Byte
MEND
MACRO
CDebug_WriteS $str, $reg, $cc
DLINE "$str",$cc,0
MEND
|
XDebugIt_WriteC * &6ba82
GBLL debugCDFSA
debugCDFSA SETL {TRUE}
MACRO
CDebug_Time
MEND
MACRO
CDebug_NewLine
Debug "CDFSA", "--"
MEND
MACRO
CDebug_StrReg8 $str, $reg, $cc
Debug "CDFSA", "$str", $reg
[ "$cc"=""
CDebug_NewLine
]
MEND
MACRO
CDebug_StrReg4 $str, $reg, $cc
Debug "CDFSA","$str", $reg
[ "$cc"=""
CDebug_NewLine
]
MEND
MACRO
CDebug_StrReg2 $str, $reg, $cc
Debug "CDFSA","$str", $reg
[ "$cc"=""
CDebug_NewLine
]
MEND
MACRO
CDebug_WriteS $str, $reg, $cc
Debug "CDFSA","$str"
[ "$cc"=""
CDebug_NewLine
]
MEND
]
]
;***************************************************************************
; Define registers etc.for general use
......
......@@ -189,7 +189,6 @@ ATAPI_Op ROUT
BL ATAPI_RawOp
ADDVC sp,sp,#4*3
GRAB "r3-r5,pc",VC ; no-error case
TEQ r0,#DRIVERERROR__SELECTION_TIMEOUT
TEQNE r0,#DRIVERERROR__OTHER_TIMEOUT
BEQ %FT90 ; serious problems, try resetting before retrying
......@@ -304,6 +303,18 @@ ATAPI_Reset ROUT
ATAPI_RawOp ROUT
STASH "r0-r2,r14"
[ cdebug
STASH "r0-r4"
CDebug_WriteS "ATAPI cmd:",cc
00
LDRB r4,[r2],#1
CDebug_StrReg2 " ",r4,cc
SUBS r1,r1,#1
BNE %B00
CDebug_NewLine
GRAB "r0-r4"
]
MOV r0,#0
MOV r14,#0
......@@ -378,7 +389,7 @@ ATAPI_RawOp ROUT
MOV r1,#12 ; actually a 6-byte comand, but padded
ADD r2,sp,#10
ADD r3,sp,#1
MOV r4,#8 ; result is 8 bytes long
MOV r4,#8+10 ; result is 8 bytes long
MOV r5,#0
SWI XADFS_ATAPIOp
......@@ -386,6 +397,19 @@ ATAPI_RawOp ROUT
SETV NE ; if this call failed we have to fake up
MOVVS pc,r6 ; an appropriate error for the first call
[ cdebug
CDebug_WriteS "AutoSense:",cc
MOV r3,#8+10
ADD r1, sp,#1
00
LDRB r4,[r1],#1
CDebug_StrReg2 " ",r4,cc
SUBS r3,r3,#1
BNE %B00
CDebug_NewLine
]
MOV r3,#0 ; build 'segment number' here
MOV r4,#0 ; build filemark/EOM/ILI/sense key here
......
......@@ -1223,7 +1223,7 @@ do_request_sense ROUT
; Issue request sense to the drive
; Only used for debugging
EntryS "r0-r8,r14"
EntryS "r0-r8"
; error so issue REQUEST SENSE
......
......@@ -48,7 +48,6 @@
GET hdr:ModHand
GET hdr:HostFS
GET hdr:NdrDebug
......@@ -86,16 +85,26 @@ startofheader
GET VersionASM ; date/version number
GET hdr.Hashes ; most hashes
GET hdr.Hashes ; most hashes including debug flags
GET hdr.IDEdefs ; IDE hashes
GET hdr.MyMacros ; macros used
GBLS getfile
[ cdebug
getfile SETS " GET hdr.cdebug ; CSD debugging"
[ useDebugMacros
GET hdr:Debug
GBLL true
true SETL 1=1
GBLL false
false SETL 1=0
|
getfile SETS ""
GET hdr:NdrDebug
]
$getfile
GBLS getfile
; [ cdebug
;getfile SETS " GET hdr.cdebug ; CSD debugging"
; |
;getfile SETS ""
; ]
; $getfile
GET Hdr:Machine.<Machine>
[ faster_startup
getfile SETS " GET hdr:CMOS"
......@@ -104,15 +113,17 @@ getfile SETS ""
]
$getfile
GBLL debug
debug SETL false
GBLL hostvdu
hostvdu SETL true
[ debug
GET Hdr:Proc
[ useDebugMacros
InsertDebugRoutines
|
InsertNDRDebugRoutines
]
]
......
......@@ -79,7 +79,7 @@ Module_Flags
;***********************************************************************************************
Module_InitialisingCode ROUT
; on entry:
; r10 -> enviroment string ( see page 631 )
; r10 -> environment string ( see page 631 )
; r11 = I/O base or instantiation number
; r12 -> currently preferred instantiation of module ( private word )
; r13 -> supervisor stack
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment