Menu
▾
▴
[ro-oslib-commits] OSLib/!OsLib/Source/Core/oslib OS.swi,1.13,1.14 OSReadSysInfo.swi,1.2,1.3
|
From: <th...@us...> - 2003-08-25 11:46:49
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv21226/Source/Core/oslib
Modified Files:
OS.swi OSReadSysInfo.swi
Log Message:
Added some extra OSMemory and OSReadSysInfo reason codes based on
the StrongHelp documentation. Change 20030825-1.
Index: OS.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib/OS.swi,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** OS.swi 29 Jun 2003 09:50:38 -0000 1.13
--- OS.swi 25 Aug 2003 11:08:04 -0000 1.14
***************
*** 2239,2260 ****
TYPE OSMemory_TypeFlags = .Bits;
CONST
! OSMemory_Type = OSMemory_TypeFlags: %111100000000,
! OSMemory_TypeShift = .Int: 8,
! OSMemory_TypeAbsent = OSMemory_TypeFlags: 0,
! OSMemory_TypeDRAM = OSMemory_TypeFlags: 1,
! OSMemory_TypeVRAM = OSMemory_TypeFlags: 2,
! OSMemory_TypeROM = OSMemory_TypeFlags: 3,
! OSMemory_TypeIO = OSMemory_TypeFlags: 4;
TYPE OSMemory_ControllerFlags = .Bits;
CONST
! OSMemory_ControllerNo = OS_ControllerFlags: &F,
! OSMemory_ControllerNoShift = .Int: 0,
! OSMemory_ControllerType = OS_ControllerFlags: &FFFFFFF0,
! OSMemory_ControllerTypeShift = .Int: 8,
! OSMemory_ControllerTypeEASI = OS_ControllerFlags: 0,
! OSMemory_ControllerTypeEASISpace = OS_ControllerFlags: 1,
! OSMemory_ControllerTypeVIDC1 = OS_ControllerFlags: 2,
! OSMemory_ControllerTypeVIDC20 = OS_ControllerFlags: 3;
SWI
--- 2239,2290 ----
TYPE OSMemory_TypeFlags = .Bits;
CONST
! OSMemory_Type = OSMemory_TypeFlags: %111100000000,
! OSMemory_TypeShift = .Int: 8,
! OSMemory_TypeAbsent = OSMemory_TypeFlags: 0,
! OSMemory_TypeDRAM = OSMemory_TypeFlags: 1,
! OSMemory_TypeVRAM = OSMemory_TypeFlags: 2,
! OSMemory_TypeROM = OSMemory_TypeFlags: 3,
! OSMemory_TypeIO = OSMemory_TypeFlags: 4,
! OSMemory_TypeSoftROM = OSMemory_TypeFlags: 5 "RISC O S 5+";
TYPE OSMemory_ControllerFlags = .Bits;
CONST
! OSMemory_ControllerNo = OS_ControllerFlags: &F,
! OSMemory_ControllerNoShift = .Int: 0,
! OSMemory_ControllerType = OS_ControllerFlags: &FFFFFFF0,
! OSMemory_ControllerTypeShift = .Int: 8,
! OSMemory_ControllerTypeEASI = OS_ControllerFlags: 0,
! OSMemory_ControllerTypeEASISpace = OS_ControllerFlags: 1,
! OSMemory_ControllerTypeVIDC1 = OS_ControllerFlags: 2,
! OSMemory_ControllerTypeVIDC20 = OS_ControllerFlags: 3,
! OSMemory_ControllerTypeSSpace = OS_ControllerFlags: 4 "RISC O S 5+",
! OSMemory_ControllerTypeExtensionROMs = OS_ControllerFlags: 5 "RISC O S 5+";
!
! TYPE OSMemory_IOFlags = .Bits;
! CONST
! OSMemory_IOBufferable = OSMemory_IOFlags: 0x100,
! OSMemory_IOCacheable = OSMemory_IOFlags: 0x200,
! OSMemory_IODoublyMapped = OSMemory_IOFlags: 0x10000,
! OSMemory_IORestrictAccess = OSMemory_IOFlags: 0x20000,
! OSMemory_IOAccess = OSMemory_IOFlags: 0xF000000,
! OSMemory_IOAccessShift = .Int: 24;
!
! TYPE OSMemory_IOReferenceKey;
!
! TYPE OSMemory_AreaFlags = .Bits;
! CONST
! OSMemory_Area = OSMemory_AreaFlags: 0xFF00,
! OSMemory_AreaShift = .Int: 8,
! OSMemory_AreaCursorSystemSound = OSMemory_AreaFlags: 1,
! OSMemory_AreaIRQStack = OSMemory_AreaFlags: 2,
! OSMemory_AreaSVCStack = OSMemory_AreaFlags: 3,
! OSMemory_AreaABTStack = OSMemory_AreaFlags: 4,
! OSMemory_AreaUNDStack = OSMemory_AreaFlags: 5,
! OSMemory_AreaSoftCAM = OSMemory_AreaFlags: 6,
! OSMemory_AreaLevelOnePageTables = OSMemory_AreaFlags: 7,
! OSMemory_AreaLevelTwoPageTables = OSMemory_AreaFlags: 8,
! OSMemory_AreaHALWorkspace = OSMemory_AreaFlags: 9,
! OSMemory_AreaKernelBuffers = OSMemory_AreaFlags: 10,
! OSMemory_AreaUncacheableHALWorkspace = OSMemory_AreaFlags: 11;
SWI
***************
*** 2313,2316 ****
--- 2343,2385 ----
EXIT
( R3! = .Int: page_number
+ ) ),
+ OSMemory_MapInPermanentIO =
+ ( NUMBER 0x68,
+ ENTRY
+ ( R0 # 13 "Permanently map in a region of IO memory - RISC O S 5+",
+ R0 | OSMemory_IOFlags: flags,
+ R1 = .Ref .Data: phys_addr,
+ R2 = .Int: size
+ ),
+ EXIT
+ ( R3! = .Ref .Data: log_addr
+ ) ),
+ OSMemory_MapInTemporaryIO =
+ ( NUMBER 0x68,
+ ENTRY
+ ( R0 # 14 "Temporarily map in 1Mb of IO memory - RISC O S 5+",
+ R0 | OSMemory_IOFlags: flags,
+ R1 = .Ref .Data: phys_addr
+ ),
+ EXIT
+ ( R2! = .Ref .Data: log_addr,
+ R3 = OSMemory_IOReferenceKey: key
+ ) ),
+ OSMemory_MapOutTemporaryIO =
+ ( NUMBER 0x68,
+ ENTRY
+ ( R0 # 15 "Map out a region of temporary IO memory - RISC O S 5+",
+ R1 = OSMemory_IOReferenceKey: key
+ ) ),
+ OSMemory_GetAreaInfo =
+ ( NUMBER 0x68,
+ ENTRY
+ ( R0 # 16 "Get information on a memory area - RISC O S 5+",
+ R0 | OSMemory_AreaFlags: type
+ ),
+ EXIT
+ ( R1! = .Ref .Data: base,
+ R2 = .Int: allocated,
+ R3 = .Int: used
) );
Index: OSReadSysInfo.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib/OSReadSysInfo.swi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSReadSysInfo.swi 20 Nov 2002 00:00:26 -0000 1.2
--- OSReadSysInfo.swi 25 Aug 2003 11:08:04 -0000 1.3
***************
*** 37,40 ****
--- 37,56 ----
OSReadSysInfo_LCDControlType1 = OSReadSysInfo_Flags2: 1;
+ TYPE OSReadSysInfo_Platform = .Int;
+ CONST
+ OSReadSysInfo_PlatformUnknown = OSReadSysInfo_PlatformClass: 0,
+ OSReadSysInfo_PlatformRiscPC = OSReadSysInfo_PlatformClass: 1,
+ OSReadSysInfo_PlatformA7000 = OSReadSysInfo_PlatformClass: 2,
+ OSReadSysInfo_PlatformA7000Plus = OSReadSysInfo_PlatformClass: 3,
+ OSReadSysInfo_PlatformHAL = OSReadSysInfo_PlatformClass: 5;
+
+ TYPE OSReadSysInfo_PlatformFlags = .Bits;
+ CONST
+ OSReadSysInfo_PlatformSupportsPodules = OSReadSysInfo_PlatformFlags: 0x1,
+ OSReadSysInfo_PlatformSupportsPCI = OSReadSysInfo_PlatformFlags: 0x2,
+ OSReadSysInfo_PlatformSupportsMultiCPU = OSReadSysInfo_PlatformFlags: 0x4,
+ OSReadSysInfo_PlatformHasSoftPowerControl = OSReadSysInfo_PlatformFlags: 0x8,
+ OSReadSysInfo_PlatformRunsOSFromRAM = OSReadSysInfo_PlatformFlags: 0x10;
+
TYPE OSReadSysInfo_ROMInformationCode = .Int;
CONST
***************
*** 102,105 ****
--- 118,141 ----
) ),
+ OSReadSysInfo_EthernetAddress =
+ ( NUMBER 0x58,
+ ENTRY
+ ( R0 # 4 "Reads the ethernet address - RISC O S 4+"
+ ),
+ EXIT
+ ( R0 = .Bits: address_lo,
+ R1 = .Bits: address_hi
+ ) ),
+
+ OSReadSysInfo_RawMachineId =
+ ( NUMBER 0x58,
+ ENTRY
+ ( R0 # 5 "Reads the raw unique machine id - RISC O S 4+"
+ ),
+ EXIT
+ ( R0 = .Bits: id_lo,
+ R1 = .Bits: id_hi
+ ) ),
+
OSReadSysInfo_KernelValue =
( NUMBER 0x58,
***************
*** 141,144 ****
--- 177,191 ----
R2 = .Ref .Data: abort_psr,
R3! = .Ref .Data: fault_address
+ ) ),
+
+ OSReadSysInfo_PlatformClass =
+ ( NUMBER 0x58,
+ ENTRY
+ ( R0 # 8 "Reads the platform class - RISC O S 4+"
+ ),
+ EXIT
+ ( R0! = OSReadSysInfo_Platform: class,
+ R1 = OSReadSysInfo_PlatformFlags: flags,
+ R2 = OSReadSysInfo_PlatformFlags: valid_flags
) ),
|
