Skip to content

GitLab

Commit dbfb1bc8 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Delete pre-source control switches 

Now we're using CVS, the switches from 1997 and earlier are just clutter.
Built same binary, not tested.

Version 1.37. Tagged as 'ATAPI-1_37'
parent 29b63845
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 191 deletions
VersionASM
View file @ dbfb1bc8
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.36"
Module_Version SETA 136
Module_MajorVersion SETS "1.37"
Module_Version SETA 137
Module_MinorVersion SETS ""
Module_Date SETS "19 Nov 2015"
Module_ApplicationDate SETS "19-Nov-15"
Module_Date SETS "17 Jan 2016"
Module_ApplicationDate SETS "17-Jan-16"
Module_ComponentName SETS "ATAPI"
Module_ComponentPath SETS "castle/RiscOS/Sources/HWSupport/CD/ATAPI"
Module_FullVersion SETS "1.36"
Module_HelpVersion SETS "1.36 (19 Nov 2015)"
Module_FullVersion SETS "1.37"
Module_HelpVersion SETS "1.37 (17 Jan 2016)"
END
VersionNum
View file @ dbfb1bc8
/* (1.36)
/* (1.37)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.36
#define Module_MajorVersion_CMHG 1.37
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 19 Nov 2015
#define Module_Date_CMHG 17 Jan 2016
#define Module_MajorVersion "1.36"
#define Module_Version 136
#define Module_MajorVersion "1.37"
#define Module_Version 137
#define Module_MinorVersion ""
#define Module_Date "19 Nov 2015"
#define Module_Date "17 Jan 2016"
#define Module_ApplicationDate "19-Nov-15"
#define Module_ApplicationDate "17-Jan-16"
#define Module_ComponentName "ATAPI"
#define Module_ComponentPath "castle/RiscOS/Sources/HWSupport/CD/ATAPI"
#define Module_FullVersion "1.36"
#define Module_HelpVersion "1.36 (19 Nov 2015)"
#define Module_LibraryVersionInfo "1:36"
#define Module_FullVersion "1.37"
#define Module_HelpVersion "1.37 (17 Jan 2016)"
#define Module_LibraryVersionInfo "1:37"
hdr/IDEdefs
View file @ dbfb1bc8
......@@ -209,9 +209,7 @@ TIMEOUT__OTHER * 1*100
]
]
[ Module_Version >= 124
TIMEOUT__RESET_RECOVERY * 10*100 ; centiseconds
]
LARGEST_DATA_CHUNK_PLUS_ONE * 2800 ; The reason for this small size is Sony (again)
; - see ReadUserData
......
hdr/hashes
View file @ dbfb1bc8
......@@ -137,62 +137,6 @@
;
GBLL full_drive_detection
[ Module_Version = 122
sony_50_id_bodge SETL {TRUE}
mode_select_dont_use_page_d SETL {FALSE}
mode_select_ignore_page_d_error SETL {TRUE}
reset_on_drive_error SETL {TRUE}
fix_cr571b10e_maybe SETL {FALSE}
fix_slow_when_no_drives SETL {FALSE}
check_mode_sense_length SETL {TRUE}
extra_delay_after_irq SETL {FALSE}
fix_speed_select SETL {FALSE}
long_command_timeout SETL {FALSE}
test_long_timeouts SETL {FALSE}
bodge_sony_selection SETL {FALSE}
faster_startup SETL {FALSE}
bodge_50e_sole_drive SETL {FALSE}
full_drive_detection SETL {FALSE}
]
[ Module_Version = 123
sony_50_id_bodge SETL {TRUE}
mode_select_dont_use_page_d SETL {FALSE}
mode_select_ignore_page_d_error SETL {TRUE}
reset_on_drive_error SETL {TRUE}
fix_cr571b10e_maybe SETL {TRUE}
fix_slow_when_no_drives SETL {TRUE}
check_mode_sense_length SETL {FALSE}
extra_delay_after_irq SETL {TRUE}
fix_speed_select SETL {FALSE}
long_command_timeout SETL {FALSE}
test_long_timeouts SETL {FALSE}
bodge_sony_selection SETL {FALSE}
faster_startup SETL {FALSE}
bodge_50e_sole_drive SETL {FALSE}
full_drive_detection SETL {FALSE}
]
[ Module_Version = 124
sony_50_id_bodge SETL {TRUE}
mode_select_dont_use_page_d SETL {FALSE}
mode_select_ignore_page_d_error SETL {TRUE}
reset_on_drive_error SETL {TRUE}
fix_cr571b10e_maybe SETL {TRUE}
fix_slow_when_no_drives SETL {TRUE}
check_mode_sense_length SETL {FALSE}
extra_delay_after_irq SETL {TRUE}
fix_speed_select SETL {FALSE}
long_command_timeout SETL {TRUE}
test_long_timeouts SETL {FALSE}
bodge_sony_selection SETL {FALSE}
faster_startup SETL {FALSE}
bodge_50e_sole_drive SETL {FALSE}
full_drive_detection SETL {FALSE}
]
[ Module_Version > 124
sony_50_id_bodge SETL {TRUE}
mode_select_dont_use_page_d SETL {TRUE}
mode_select_ignore_page_d_error SETL {TRUE}
......@@ -208,11 +152,6 @@ bodge_sony_selection SETL {TRUE}
faster_startup SETL {TRUE}
bodge_50e_sole_drive SETL {TRUE}
full_drive_detection SETL :LNOT: HAL
]
[ Module_Version < 122
! 1,"Assembly flags not defined for this version"
]
[ sony_50_id_bodge
! 0,"Sony CDU50E 0.3n bodge included"
......
s/ATAPIStuff
View file @ dbfb1bc8
......@@ -758,10 +758,6 @@ AO_GotDrive
; drive is ready
; r1 -> registers
[ Module_Version < 125
LDR r1,TBA
]
[ bodge_50e_sole_drive
; Enable IRQ in digital output (device control) register so can poll for it
......@@ -1471,9 +1467,7 @@ WaitForIRQ ROUT
;------------------------------------------------------------------------------
[ Module_Version > 124
LTORG
]
;------------------------------------------------------------------------------
; ATAPI_Reset
......@@ -1525,11 +1519,7 @@ ATAPI_Reset ROUT
; wait for up to 10 seconds for drive to be not BSY
SWI XOS_ReadMonotonicTime
[ Module_Version >= 124
ADD r2,r0,#TIMEOUT__RESET_RECOVERY ; r2 = finish time
|
ADD r2,r0,#10*100 ; r2 = finish time
]
20
LDRB r0,[r1,#TASKFILE__R_STATUS] ; get status
......
s/DriverCode
View file @ dbfb1bc8
......@@ -196,12 +196,10 @@ jump_table_start
DCW notsupported - jump_table_start - 4 ; 29
DCW Identify - jump_table_start - 4 ; 30
DCW ReadAudio - jump_table_start - 4 ; 31
[ Module_Version >= 105
DCW ReadUserData - jump_table_start - 4 ; 32
DCW notsupported - jump_table_start - 4 ; 33
DCW GetAudioParms - jump_table_start - 4 ; 34
DCW SetAudioParms - jump_table_start - 4 ; 35
]
[ HAL
DCW SCSIUserOp - jump_table_start - 4 ; 36
]
......@@ -745,23 +743,6 @@ GetParameters ROUT
MACRO__EXIT_DRIVER_OK
]
; [ Module_Version >= 108
;; r6 -> parameter block
; MOV r6, r0
; MOV r3, # 5 ; inactivity timer
; MOV r4, # 3 ; retry count
; MOV r8, # 0 ; speed setting
; | ; old way
; r6 -> parameter block
MOV r6, r0
......@@ -799,11 +780,8 @@ GetParameters ROUT
ADR r2, buffer
BL GP_FindModePage
[ Module_Version >= 108
TEQ r2, # 0
BEQ GP_CouldntFindPage
]
LDRB r3, [ r2, # 3 ]
AND r3, r3, # 2_1111
......@@ -815,10 +793,8 @@ GetParameters ROUT
ADR r2, buffer
BL GP_FindModePage
[ Module_Version >= 108
TEQ r2, # 0
BEQ GP_CouldntFindPage
]
LDRB r4, [ r2, # 3 ]
......@@ -829,10 +805,8 @@ GetParameters ROUT
ADR r2, buffer
BL GP_FindModePage
[ Module_Version >= 108
TEQ r2, # 0
BEQ GP_CouldntFindPage
]
LDRB r8, [ r2, # 15 ]
LDRB r14, [ r2, # 14 ]
......@@ -840,10 +814,6 @@ GetParameters ROUT
DivRem r8, r14, # 176, r5
; ]
;----------------------------------
; What's the current data mode ?
;----------------------------------
......@@ -857,9 +827,6 @@ GetParameters ROUT
MACRO__EXIT_DRIVER_OK ; V is clear
[ Module_Version >= 108
GP_CurrentModeSense
DCB ATAPI__MODE_SENSE ; 0 opcode
DCB 0 ; 1 reserved
......@@ -874,26 +841,6 @@ GP_CurrentModeSense
DCB 0 ; 10 reserved
DCB 0 ; 11 reserved
| ; old way
GP_CurrentModeSense
DCB ATAPI__MODE_SENSE ; 0 opcode
DCB 0 ; 1 reserved
DCB (2_00:SHL:6) + &3f ; 2 current values + all pages
DCB 0 ; 3 reserved
DCB 0 ; 4 reserved
DCB 0 ; 5 reserved
DCB 0 ; 6 reserved
DCB BUFFER_SIZE:AND:&FF ; 7 Allocation length (MSB)
DCB BUFFER_SIZE:SHR:8 ; 8 Allocation length (LSB)
DCB 0 ; 9 reserved
DCB 0 ; 10 reserved
DCB 0 ; 11 reserved
]
; This small routine will look through 'buffer' to find page number in r1, returning a pointer
; in r2
; on entry:
......@@ -904,8 +851,6 @@ GP_CurrentModeSense
GP_FindModePage
[ Module_Version >= 108
Push "r3-r5, r14"
; r5 = count of the number of bytes actually read in
......@@ -949,44 +894,6 @@ GP_CouldntFindPage
B error_handler_lookup
| ; old way
Push "r3-r5, r14"
ADD r2, r2, # 8
; r5 = count of the number of bytes actually read in
; this is just to prevent the hilarious 'abort on data
; transfer' because a page is present for some reason
; NEC where are your mandatory mode sense pages ?
LDRB r3, [ r2, # 0 ]
LDRB r5, [ r2, # 1 ]
ORR r5, r5, r3, LSL # 8
SUB r5, r5, # 8 + 2
GP_FindPageLoop
CMP r5, # 0
Pull "r3-r5, pc", LE
LDRB r3, [ r2, # 0 ] ; page number
AND r3, r3, # 2_111111
LDRB r4, [ r2, # 1 ] ; page length
CMP r3, r1
ADDLT r3, r4, # 2 ; + 2 bytes to reach next page
ADDLT r2, r2, r3
ADDLT r5, r5, r3
; ADDLT r2, r2, r4
; ADDLT r2, r2, # 2 ; + 2 bytes to reach next page
BLT GP_FindPageLoop
Pull "r3-r5, pc"
]
;-----------------------------------------------------------------------------------------------
SetParameters ROUT
;
......@@ -1096,10 +1003,8 @@ SP_DoneSpeed
ADR r2, buffer + 16
BL GP_FindModePage
[ Module_Version >= 108
TEQ r2, # 0
BEQ GP_CouldntFindPage
]
; r2 -> page &0D (CD-ROM parameters)
......@@ -1117,10 +1022,8 @@ SP_DoneSpeed
ADR r2, buffer + 16
BL GP_FindModePage
[ Module_Version >= 108
TEQ r2, # 0
BEQ GP_CouldntFindPage
]
; r2 -> page &01 (error recovery parameters)
......@@ -2965,8 +2868,6 @@ RA_CDBReadCD
ALIGN
[ Module_Version >= 105
;-----------------------------------------------------------------------------------------------
ReadUserData ROUT
;
......@@ -3368,9 +3269,6 @@ RUD_ReadAll
Pull "r2-r8, pc" ; pass V flag back to caller
] ; Module_Version >= 105
;-----------------------------------------------------------------------------------------------
GetAudioParms ROUT
; on entry:
......
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