Commit 83c6bab3 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Ursula_RiscPC branch merged.

Detail:
  The Ursula_RiscPC branch contained version 3.30 of ADFS, which had
  minimal updates for Ursula, such as the service call table. This
  version, incorporating changes on the Ursula branch up to
  the Ursula_RiscPC_bp tag, is now merged on to the trunk as 3.32.
  This leaves version 3.31 on the Ursula branch, unmerged. This contains
  unfinished support for auto-detection of IDE drives and support for
  Phoebe hardware.

Version 3.32. Tagged as 'ADFS-3_32'
parent eee8692b
GET Version
A1 SETL {TRUE}
FDC1772 SETL {TRUE}
Top16Write SETL {FALSE}
IOMD SETL {TRUE}
END
; Version number file > version
GET VersionASM
GBLS version
version SETS "3.29" ; RiscOS 3.10 versions are >= 2.67
; RiscOS Black versions are >= 2.92
version SETS Module_MajorVersion
GBLS date
date SETS "10 Feb 1997"
date SETS Module_Date
GBLA max_fix
max_fix SETA 12
......
......@@ -8,11 +8,11 @@
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
Module_MajorVersion SETS "3.31"
Module_Version SETA 331
Module_MajorVersion SETS "3.32"
Module_Version SETA 332
Module_MinorVersion SETS ""
Module_Date SETS "11 Jul 2000"
Module_ApplicationDate2 SETS "11-Jul-00"
Module_ApplicationDate4 SETS "11-Jul-2000"
Module_FullVersion SETS "3.31"
Module_FullVersion SETS "3.32"
END
/* (3.31)
/* (3.32)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 3.31
#define Module_MajorVersion_CMHG 3.32
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 11 Jul 2000
#define Module_MajorVersion "3.31"
#define Module_Version 331
#define Module_MajorVersion "3.32"
#define Module_Version 332
#define Module_MinorVersion ""
#define Module_Date "11 Jul 2000"
#define Module_ApplicationDate2 "11-Jul-00"
#define Module_ApplicationDate4 "11-Jul-2000"
#define Module_FullVersion "3.31"
#define Module_FullVersion "3.32"
......@@ -27,6 +27,9 @@ ARM810support SETL {FALSE}
GET Hdr:Macros
GET Hdr:System
GET Hdr:DevNos
GET Hdr:Machine.<Machine>
GET Hdr:IO.IOEB
$GetIO
GET Hdr:CMOS
GET Hdr:Services
GET Hdr:ModHand
......@@ -42,8 +45,6 @@ ARM810support SETL {FALSE}
GET Hdr:NewErrors
GET Hdr:Portable
GET Hdr:Proc
GET Hdr:IO.IOEB
GET Hdr:IO.IOMD
GET Hdr:CPU.ARM600
GET s.NewBits
......
......@@ -458,7 +458,25 @@ ErrX Pull "R7-R11,SB,LR" ; Else restore caller's regs
; ServiceEntry
; >>>>>>>>>>>>
[ ServicePolice
ServiceTable
& 0 ; flags
& ServiceEntry2 - org
& Service_Reset
& Service_Portable
& Service_ADFSPoduleIDEDying
& 0
ServiceEntry2
Push "LR"
B ServiceEntry3
& ServiceTable - org
]
ServiceEntry ROUT
[ ServicePolice
MOV r0, r0
]
Push "LR"
TEQS R1,#Service_Reset ; Post reset service call?
......@@ -468,7 +486,9 @@ ServiceEntry ROUT
Pull "PC",NE,^ ; if no, return
; Reset, portable or PoduleIDEDying service
[ ServicePolice
ServiceEntry3
]
getSB
; Check service type again - done this way to speed up handling
......
......@@ -44,4 +44,8 @@ EngineeringMode SETL {TRUE}
GBLL IDEPower
IDEPower SETL {TRUE}
; enables Ursula-style service table
GBLL ServicePolice
ServicePolice SETL {TRUE}
END
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