Skip to content

GitLab

Commit 1143f776 authored by John Beranek's avatar John Beranek
Browse files

Merged Ursula branch, moved to srccommit. 

Detail:
  Merged Ursula branch, only change was removal of dynamic dependencies
   from Makefile.

  Moved to srccommit usage, changed some occurences of "Version" to
   "ModuleVersion", as defined in VersionASM. Removed obsolete "Version"
   file.
Admin:
  Added stripdepend call to clean rule
  Additionally added a "GET Hdr:Machine.<Machine>" into s.Main to
   make it assemble correctly.


Version 1.26. Tagged as 'ATAPI-1_26'
parent 51ff8733
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 50 deletions
Makefile
View file @ 1143f776
......@@ -35,6 +35,7 @@ MKDIR = cdir
AS = aasm
CP = copy
RM = remove
STRIP = stripdepnd
CFLAGS = -c -depend !Depend -IC:
AFLAGS = -depend !Depend -Stamp -quit -module
......@@ -70,6 +71,7 @@ resources:
clean:
${RM} ${TARGET}
${STRIP}
@echo ${COMPONENT}: cleaned
${TARGET}: ${SOURCE}
......
Version deleted 100644 → 0
View file @ 51ff8733
; > Version
GBLA Version
GBLS VString
GBLS Date
Version SETA 125
VString SETS "1.25"
Date SETS "09 Aug 1995"
END
VersionASM
View file @ 1143f776
......@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.25"
Module_Version SETA 125
Module_MajorVersion SETS "1.26"
Module_Version SETA 126
Module_MinorVersion SETS ""
Module_Date SETS "24 Nov 2000"
Module_ApplicationDate2 SETS "24-Nov-00"
Module_ApplicationDate4 SETS "24-Nov-2000"
Module_Date SETS "30 Nov 2000"
Module_ApplicationDate2 SETS "30-Nov-00"
Module_ApplicationDate4 SETS "30-Nov-2000"
Module_ComponentName SETS "ATAPI"
Module_ComponentPath SETS "RiscOS/Sources/HWSupport/CD/ATAPI"
Module_FullVersion SETS "1.25"
Module_HelpVersion SETS "1.25 (24 Nov 2000)"
Module_FullVersion SETS "1.26"
Module_HelpVersion SETS "1.26 (30 Nov 2000)"
END
VersionNum
View file @ 1143f776
/* (1.25)
/* (1.26)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 1.25
#define Module_MajorVersion_CMHG 1.26
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 Nov 2000
#define Module_Date_CMHG 30 Nov 2000
#define Module_MajorVersion "1.25"
#define Module_Version 125
#define Module_MajorVersion "1.26"
#define Module_Version 126
#define Module_MinorVersion ""
#define Module_Date "24 Nov 2000"
#define Module_Date "30 Nov 2000"
#define Module_ApplicationDate2 "24-Nov-00"
#define Module_ApplicationDate4 "24-Nov-2000"
#define Module_ApplicationDate2 "30-Nov-00"
#define Module_ApplicationDate4 "30-Nov-2000"
#define Module_ComponentName "ATAPI"
#define Module_ComponentPath "RiscOS/Sources/HWSupport/CD/ATAPI"
#define Module_FullVersion "1.25"
#define Module_HelpVersion "1.25 (24 Nov 2000)"
#define Module_FullVersion "1.26"
#define Module_HelpVersion "1.26 (30 Nov 2000)"
hdr/IDEdefs
View file @ 1143f776
......@@ -201,7 +201,7 @@ TIMEOUT__OTHER * 1*100
]
]
[ Version >= 124
[ Module_Version >= 124
TIMEOUT__RESET_RECOVERY * 10*100 ; centiseconds
]
......
hdr/hashes
View file @ 1143f776
......@@ -138,7 +138,7 @@
GBLL full_drive_detection
[ Version = 122
[ 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}
......@@ -156,7 +156,7 @@ bodge_50e_sole_drive SETL {FALSE}
full_drive_detection SETL {FALSE}
]
[ Version = 123
[ 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}
......@@ -174,7 +174,7 @@ bodge_50e_sole_drive SETL {FALSE}
full_drive_detection SETL {FALSE}
]
[ Version = 124
[ 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}
......@@ -192,7 +192,7 @@ bodge_50e_sole_drive SETL {FALSE}
full_drive_detection SETL {FALSE}
]
[ Version = 125
[ Module_Version = 125
sony_50_id_bodge SETL {TRUE}
mode_select_dont_use_page_d SETL {FALSE}
mode_select_ignore_page_d_error SETL {TRUE}
......@@ -210,7 +210,7 @@ bodge_50e_sole_drive SETL {TRUE}
full_drive_detection SETL {TRUE}
]
[ (Version < 122) :LOR: (Version > 125)
[ (Module_Version < 122) :LOR: (Module_Version > 125)
! 1,"Assembly flags not defined for this version"
]
......@@ -672,7 +672,7 @@ SUPPORT__READ_AUDIO * 1:SHL:14
SUPPORT__AUDIO_PARMS * 1:SHL:15
[ Version >= 105
[ Module_Version >= 105
ATAPI_VERSIONBITS * (SUPPORT__SPEED_MULTIPLIER * 4) + SUPPORT__READ_AUDIO + SUPPORT__CLOSE_DRAWER + SUPPORT__AUDIO_PARMS
......
s/ATAPIStuff
View file @ 1143f776
......@@ -345,7 +345,7 @@ AO_GotDrive
; drive is ready
; r1 -> registers
[ Version < 125
[ Module_Version < 125
LDR r1,TBA
]
......@@ -1057,7 +1057,7 @@ WaitForIRQ ROUT
;------------------------------------------------------------------------------
[ Version > 124
[ Module_Version > 124
LTORG
]
......@@ -1112,7 +1112,7 @@ ATAPI_Reset ROUT
; wait for up to 10 seconds for drive to be not BSY
SWI XOS_ReadMonotonicTime
[ Version >= 124
[ Module_Version >= 124
ADD r2,r0,#TIMEOUT__RESET_RECOVERY ; r2 = finish time
|
ADD r2,r0,#10*100 ; r2 = finish time
......
s/DriverCode
View file @ 1143f776
......@@ -191,7 +191,7 @@ jump_table_start
DCW Identify - jump_table_start - 4 ; 30
DCW ReadAudio - jump_table_start - 4 ; 31
[ Version >= 105
[ Module_Version >= 105
DCW ReadUserData - jump_table_start - 4 ; 32
DCW notsupported - jump_table_start - 4 ; 33
DCW GetAudioParms - jump_table_start - 4 ; 34
......@@ -737,7 +737,7 @@ GetParameters ROUT
; [ Version >= 108
; [ Module_Version >= 108
;; r6 -> parameter block
......@@ -788,7 +788,7 @@ GetParameters ROUT
ADR r2, buffer
BL GP_FindModePage
[ Version >= 108
[ Module_Version >= 108
TEQ r2, # 0
BEQ GP_CouldntFindPage
]
......@@ -804,7 +804,7 @@ GetParameters ROUT
ADR r2, buffer
BL GP_FindModePage
[ Version >= 108
[ Module_Version >= 108
TEQ r2, # 0
BEQ GP_CouldntFindPage
]
......@@ -818,7 +818,7 @@ GetParameters ROUT
ADR r2, buffer
BL GP_FindModePage
[ Version >= 108
[ Module_Version >= 108
TEQ r2, # 0
BEQ GP_CouldntFindPage
]
......@@ -848,7 +848,7 @@ GetParameters ROUT
BICS pc, r14, # Overflow_Flag
[ Version >= 108
[ Module_Version >= 108
GP_CurrentModeSense
DCB ATAPI__MODE_SENSE ; 0 opcode
......@@ -894,7 +894,7 @@ GP_CurrentModeSense
GP_FindModePage
[ Version >= 108
[ Module_Version >= 108
STASH "r3-r5, r14"
......@@ -1087,7 +1087,7 @@ SP_DoneSpeed
ADR r2, buffer + 16
BL GP_FindModePage
[ Version >= 108
[ Module_Version >= 108
TEQ r2, # 0
BEQ GP_CouldntFindPage
]
......@@ -1108,7 +1108,7 @@ SP_DoneSpeed
ADR r2, buffer + 16
BL GP_FindModePage
[ Version >= 108
[ Module_Version >= 108
TEQ r2, # 0
BEQ GP_CouldntFindPage
]
......@@ -2928,7 +2928,7 @@ RA_CDBReadCD
ALIGN
[ Version >= 105
[ Module_Version >= 105
;-----------------------------------------------------------------------------------------------
ReadUserData ROUT
......@@ -3329,7 +3329,7 @@ RUD_ReadAll
ORRVSS pc, r14, # Overflow_Flag
BICS pc, r14, # Overflow_Flag
] ; Version >= 105
] ; Module_Version >= 105
;-----------------------------------------------------------------------------------------------
......
s/Main
View file @ 1143f776
......@@ -75,7 +75,7 @@ startofheader
DCD 0 ;
GET Version ; date/version number
GET VersionASM ; date/version number
GET hdr.Hashes ; most hashes
GET hdr.IDEdefs ; IDE hashes
GET hdr.Macros ; macros used
......@@ -92,6 +92,7 @@ getfile SETS " GET hdr:ListOpts"
getfile SETS ""
]
$getfile
GET Hdr:Machine.<Machine>
[ faster_startup
getfile SETS " GET hdr:CMOS"
|
......
s/Strings
View file @ 1143f776
......@@ -106,7 +106,7 @@ title = "CDFSSoftATAPI", 0
ALIGN
help = "CDFSSoftATAPI",9, "$VString ($Date)"
help = "CDFSSoftATAPI",9, "$Module_HelpVersion"
[ cdebug
= " DEBUG VERSION"
]
......
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