Commit cf8c3477 authored by John Beranek's avatar John Beranek
Browse files

Merged Ursula branch and added srccommit support

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

  Moved to srccommit, changed lots of occurrences of "Version" to
   "Module_Version", as defined in VersionASM. Removed old "Version" file.
Admin:
  Added stripdepend call into clean rule.


Version 2.41. Tagged as 'CDFSFiler-2_41'
parent 3d3cdece
......@@ -40,6 +40,7 @@ MKDIR = cdir
AS = aasm
CP = copy
RM = remove
STRIP = stripdepnd
CFLAGS = -c -depend !Depend -IC:
AFLAGS = -depend !Depend -Stamp -quit -module
......@@ -63,6 +64,7 @@ resources:
clean:
${RM} ${TARGET}
${STRIP}
@echo ${COMPONENT}: cleaned
${TARGET}: ${SOURCE}
......
......@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.40"
Module_Version SETA 240
Module_MajorVersion SETS "2.41"
Module_Version SETA 241
Module_MinorVersion SETS ""
Module_Date SETS "30 Nov 2000"
Module_ApplicationDate2 SETS "30-Nov-00"
Module_ApplicationDate4 SETS "30-Nov-2000"
Module_ComponentName SETS "CDFSFiler"
Module_ComponentPath SETS "RiscOS/Sources/FileSys/CDFS/CDFSFiler"
Module_FullVersion SETS "2.40"
Module_HelpVersion SETS "2.40 (30 Nov 2000)"
Module_FullVersion SETS "2.41"
Module_HelpVersion SETS "2.41 (30 Nov 2000)"
END
/* (2.40)
/* (2.41)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.40
#define Module_MajorVersion_CMHG 2.41
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 30 Nov 2000
#define Module_MajorVersion "2.40"
#define Module_Version 240
#define Module_MajorVersion "2.41"
#define Module_Version 241
#define Module_MinorVersion ""
#define Module_Date "30 Nov 2000"
......@@ -18,5 +18,5 @@
#define Module_ComponentName "CDFSFiler"
#define Module_ComponentPath "RiscOS/Sources/FileSys/CDFS/CDFSFiler"
#define Module_FullVersion "2.40"
#define Module_HelpVersion "2.40 (30 Nov 2000)"
#define Module_FullVersion "2.41"
#define Module_HelpVersion "2.41 (30 Nov 2000)"
......@@ -94,7 +94,7 @@ Module_BaseAddr
;
GET hdr.Icons
GET Version
GET VersionASM
; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; Options
......@@ -204,7 +204,7 @@ len_mediaprefix * :LEN:"CDFS::"-len_colon
^ 0, wp
mywimpversion # 4 ; another wimp version
[ Version >= 213
[ Module_Version >= 213
loop # 4
]
......@@ -213,7 +213,7 @@ FilerHandle # 4 ; id so we can contact Filer
privateword # 4
wimpversion # 4
[ Version > 201
[ Module_Version > 201
messagedata # 4
]
......@@ -290,7 +290,7 @@ userdata # &100
stackbot # &200
stacktop # 0
[ Version >= 213
[ Module_Version >= 213
sprite_name_list # 12*ndrives
]
......@@ -330,7 +330,7 @@ driveno * m_cdromdisc + m_title + :LEN:"CDFS:"
CDFSFiler_HelpString
DCB "CDFSFiler"
DCB TAB
DCB "$VString ($Date)", 0
DCB "$Module_HelpVersion", 0
[ International_Help <> 0
Desktop_CDFSFiler_Help
......@@ -348,7 +348,7 @@ Desktop_CDFSFiler_Syntax DCB "Syntax: *Desktop_" ; drop through!
CDFSFiler_TitleString DCB "CDFSFiler", 0
[ Version > 201
[ Module_Version > 201
CDFSFiler_Banner DCB "CDFS Filer", 0
]
......@@ -368,7 +368,7 @@ CDFSFiler_StarCommand
; This is now in the Resources FS
;-----------------------------------------------
[ Version > 201
[ Module_Version > 201
spritefile = "IconSprites <CDFSFiler$Path>Sprites", 0
|
spritefile = "IconSprites CDFS::29.$.SPRITES", 0
......@@ -383,7 +383,7 @@ spritefile = "IconSprites CDFS::29.$.SPRITES", 0
; Set the 'CDFSFiler$Path' variable
;-----------------------------------------------------------------
[ Version > 201
[ Module_Version > 201
CDFSFiler_Init ENTRY "r1-r5"
......@@ -422,7 +422,7 @@ PathDefault DCB "Resources:$.Resources.CDFSFiler."
; Had *command to enter CDFSFiler, so start up via module handler
[ Version > 201
[ Module_Version > 201
Desktop_CDFSFiler_Code ENTRY
......@@ -495,7 +495,7 @@ CDFSFiler_Service ROUT
TEQ r1, #Service_Reset ; &27
BEQ CDFSFiler_Service_Reset
[ Version > 201
[ Module_Version > 201
TEQ r1, #Service_MessageFileClosed
BEQ CDFSFiler_Service_MessageFileClosed
]
......@@ -546,7 +546,7 @@ CDFSFiler_Service_StartFiler ENTRY "r0-r3"
MOV r0, #0
[ Version > 201
[ Module_Version > 201
STR r0, [r2, #:INDEX:messagedata]
]
......@@ -576,7 +576,7 @@ CDFSFiler_Service_Reset ENTRY "r0-r6"
EXITS ; Sorry, but no can do errors here
[ Version > 201
[ Module_Version > 201
CDFSFiler_Service_MessageFileClosed ENTRY "r0-r2,r12"
LDR r12, [r12] ; are we active?
......@@ -585,14 +585,14 @@ CDFSFiler_Service_MessageFileClosed ENTRY "r0-r2,r12"
Debug service,"Service_MessageFileClosed r0=",r0
[ Version >=236
[ Module_Version >=236
ADRL r1, driveno+1 ; preserve drive number across menu creation
LDRB r2, [r1]
]
BL CopyMenus ; re-open message file etc.
[ Version >= 236
[ Module_Version >= 236
STRB r2, [r1]
]
......@@ -629,7 +629,7 @@ freeworkspace ROUT
SWIGT XWimp_CloseDown ; ignore errors from this
[ Version > 201
[ Module_Version > 201
BL deallocatemessagedata ; well actually we can until we free
]
......@@ -652,7 +652,7 @@ taskidentifier
; Added for RISC OS 3
;-------------------------------------------
[ Version > 201
[ Module_Version > 201
MessagesList DCD Message_HelpRequest
DCD Message_MenuWarning
......@@ -687,7 +687,7 @@ Abort
; Get text from the messages file
;------------------------------------------------------------
[ Version > 201
[ Module_Version > 201
MkCantStartError
MOV r8, lr
......@@ -748,7 +748,7 @@ CDFSFiler_Start ROUT
; Get an error message from the 'Messages' file
;----------------------------------------------
[ Version > 201
[ Module_Version > 201
BLLE MkCantStartError ; New way
SWIVS OS_GenerateError ;
|
......@@ -769,7 +769,7 @@ CDFSFiler_Start ROUT
; We know about wimp 3.00 and have a messages list.
;--------------------------------------------------
[ Version > 201
[ Module_Version > 201
MOV r0, #300 ; NEW - know about wimp 3.00 and have a messages list.
LDR r1, taskidentifier
BL MkBannerIn_userdata
......@@ -920,7 +920,7 @@ repollwimp ROUT
CMP r0, #Mouse_Button_Change
BEQ event_mouse_click
[ Version >= 236
[ Module_Version >= 236
CMP r0, #Key_Pressed
BEQ event_key_pressed
]
......@@ -934,7 +934,7 @@ repollwimp ROUT
B repollwimp
[ Version >= 236
[ Module_Version >= 236
; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
;
......@@ -1449,7 +1449,7 @@ SVL_End
; Different way of opening filer directory
;--------------------------------------------------
[ Version >= 201
[ Module_Version >= 201
FilerOpenDirCommand DCB "%Filer_OpenDir ",0
]
......@@ -1460,7 +1460,7 @@ FilerOpenDirCommand DCB "%Filer_OpenDir ",0
; all regs trashable
;
[ Version >= 213
[ Module_Version >= 213
photo_disc_sprite = "Spcddisc", 0
audio_disc_sprite = "Sacddisc", 0
ALIGN
......@@ -1478,7 +1478,7 @@ click_select_iconbar ROUT
; Make into the normal icon
;--------------------------
; r4 = icon number on icon bar
[ Version >= 213
[ Module_Version >= 213
ADRL r0, iconspritename
BL change_icon_sprite
......@@ -1623,7 +1623,7 @@ not_audio ; - so must be an error
]
[ Version >= 213
[ Module_Version >= 213
; This is the pathame that indicates that it is a photocd
photocd_filename = ".$.PHOTO_CD.INFO/PCD", 0
......@@ -1734,7 +1734,7 @@ DiscCheck_NotPhotoCD
OpenDirectoryViewer
[ Version > 201
[ Module_Version > 201
Push "r1"
ADRL r1,userdata
ADRL r2,FilerOpenDirCommand
......@@ -1768,7 +1768,7 @@ OpenDirectoryViewer
;
;-----------------------------------------------------------------------------------------------
[ Version >= 213
[ Module_Version >= 213
change_icon_sprite ROUT
Push "r0-r4, r14"
......@@ -1936,7 +1936,7 @@ matchdriveicon ENTRY "r2"
LDREQB r14, [r1, #drv_number+2] ; second digit (if any)
STREQB r14, driveno+2
[ Version > 201
[ Module_Version > 201
MOVEQ r14, #0
STREQB r14, driveno + 3
]
......@@ -1949,7 +1949,7 @@ matchdriveicon ENTRY "r2"
; Lookup error tag in Messages file
;---------------------------------------
[ Version > 201
[ Module_Version > 201
ADR r0, err_noicon
BL lookuperror
|
......@@ -1963,7 +1963,7 @@ matchdriveicon ENTRY "r2"
; Lookup error tag in Messages file
;---------------------------------------
[ Version > 201
[ Module_Version > 201
err_noicon
DCD 0
......@@ -2329,7 +2329,7 @@ dismountit ENTRY "r1"
LDR r0, =Message_FilerCloseDir
BL messagetoFiler
[ Version >= 212
[ Module_Version >= 212
; cause an event so that the filer closes it's windows before I *dismount
MOV r3, r0
MOV r0, #0
......@@ -3247,7 +3247,7 @@ getmedialoop
; Ambiguous disc name error not reported any more
;--------------------------------------------------
[ Version <= 201
[ Module_Version <= 201
;****** Ask if you wish to forget about the old disc OK
......@@ -3269,7 +3269,7 @@ getmedialoop
; Dismount the drive by name
;---------------------------------
[ Version > 201
[ Module_Version > 201
BL dismountit_byname
|
BL dismountit
......@@ -3281,7 +3281,7 @@ getmedialoop
B getmedialoop ; try again!
[ Version > 201
[ Module_Version > 201
dismountit_byname ENTRY "r1"
ADRL r3, dismount
......@@ -3320,7 +3320,7 @@ checkambiguous ENTRY "r1-r5"
; Ambiguous disc names are no longer reported
;--------------------------------------------
[ Version <= 201
[ Module_Version <= 201
err_ambiguous
DCD 1
DCB "This disc has a name that has been seen before. "
......@@ -3332,7 +3332,7 @@ err_ambiguous
; Old way of getting the disc name
;-------------------------------------------------------------------------------
[ Version <= 201
[ Module_Version <= 201
star_dir_CDFS DCB "%Dir CDFS:", 0
star_back DCB "%Back", 0
......@@ -3479,7 +3479,7 @@ GetPointerInfo ROUT
LTORG
[ Version > 201
[ Module_Version > 201
ic_player0
= ":0",0,0,":1",0,0,":2",0,0,":3",0,0,":4",0,0,":5",0,0,":6",0,0,":7",0,0,":8",0,0,":9",0,0
= ":10",0,":11",0,":12",0,":13",0,":14",0,":15",0,":16",0,":17",0,":18",0
......@@ -3507,7 +3507,7 @@ SetUpIconBar ENTRY
dont_worry
[ Version > 201
[ Module_Version > 201
addr r1, ic_player0 - 4 ; r1->:<drive number>,0
ADD r1, r1, r2, LSL #2
......@@ -3530,7 +3530,7 @@ more_drives
CMP r4, r2
EXIT GE
[ Version >= 213
[ Module_Version >= 213
STR r4, loop
]
......@@ -3602,7 +3602,7 @@ more_drives
; Need to build up a sprite name so that it can be changed for photocd, or audio cd
;----------------------------------------------------------------------------------
; r4 = drive number
[ Version >= 213
[ Module_Version >= 213
LDR r1, loop
ADRL r3, sprite_name_list
ADD r3, r3, r1, LSL #3
......@@ -3647,7 +3647,7 @@ more_drives
EXIT VS
[ Version > 201
[ Module_Version > 201
SUB r1, r1, #4 ; Move to next icon def
......@@ -3792,7 +3792,7 @@ event_user_message ENTRY
; Interactive help for menus
;----------------------------------------
[ Version > 201
[ Module_Version > 201
LDR r14, =Message_HelpRequest
CMP r0, r14
BEQ returnhelp
......@@ -3808,7 +3808,7 @@ event_user_message ENTRY
[ Version > 201
[ Module_Version > 201
; Token used by the XMessage_Lookup SWI for interactive help
......@@ -3968,7 +3968,7 @@ SendHelpMessage
; [r1..] = message, terminated by 0
; r2 = size of string, including the terminator
[ Version > 201
[ Module_Version > 201
str_messagefile DCB "CDFSFiler:Messages", 0 ; "<CDFSFilerCompile$Dir>.Messages", 0
str_templatefile DCB "CDFSFiler:Templates", 0
]
......@@ -4070,7 +4070,7 @@ ReportError ENTRY "r2"
; Get title from 'Messages' file
;----------------------------------------------------
[ Version > 201
[ Module_Version > 201
BL MkBannerIn_userdata
SWI XWimp_ReportError
|
......
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