Menu
▾
▴
ro-oslib-commits — list to notify of all commits to OSLib
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(39) |
Dec
(23) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(4) |
Feb
(8) |
Mar
|
Apr
|
May
|
Jun
(25) |
Jul
(2) |
Aug
(3) |
Sep
(9) |
Oct
|
Nov
(2) |
Dec
(21) |
| 2004 |
Jan
(57) |
Feb
|
Mar
|
Apr
|
May
(49) |
Jun
|
Jul
(8) |
Aug
(5) |
Sep
(2) |
Oct
(2) |
Nov
(2) |
Dec
|
| 2005 |
Jan
(2) |
Feb
|
Mar
(12) |
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(17) |
| 2006 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(3) |
Feb
|
Mar
|
Apr
(18) |
May
(13) |
Jun
(17) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
|
|
From: <to...@us...> - 2002-11-28 13:09:03
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv19925/OSLib/!OsLib/docs
Modified Files:
ChangeLog
Log Message:
Various enhabcements and bug-fixes. Updated Test suite
Index: ChangeLog
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/docs/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ChangeLog 27 Nov 2002 22:11:03 -0000 1.18
--- ChangeLog 28 Nov 2002 13:09:00 -0000 1.19
***************
*** 1,3 ****
! OSLib Version next - Tony van der Hoff - 28/08/2002
------------------
* Enhancements:
--- 1,3 ----
! OSLib Version 6.40 - Tony van der Hoff - 28/11/2002
------------------
* Enhancements:
***************
*** 5,13 ****
TYPE Wimp_SetIconStateBlock (wimp_set_icon_state_block) to implement the native
RISC OS SWI. (Philip Ludlam)
-
- Adds WimpSpriteOp_ReadSpriteInfo; synonymous with WimpSpriteOp_ReadSpriteSize,
and OSSpriteOp_ReadSpriteInfo; synonymous with OSSpriteOp_ReadSpriteSize. This
reflects better the PRM descriptions. (Philip Ludlam)
-
- Added Help_FullMessageRequest, Help_FullMessageReply, Help_FullMessageEnable,
which had been omitted when full message blocks were introduced in Version 6.00.
--- 5,11 ----
***************
*** 30,33 ****
--- 28,33 ----
- Updated FileCore to reflect RISC O S 5 changes, including the
addition of FileCore_DiscOp64. (Tom Hughes)
+ - Adds OSSpriteOp_ReadPixelColourDeep and OSSpriteOp_WritePixelColourDeep to
+ manipulate 24-bit RGB values. (John Clark)
- Distribution now includes 32-bit neutral version of OSLibSupport32
library. (Tony van der Hoff)
***************
*** 38,65 ****
which had been coded in pre-ANSI C, has been replaced by a modern port of
bison. Castle 32-bit compiler. (Tony van der Hoff)
!
!
* Bug Fixes:
- Font_ReadFontMetrics misc information structure (Font_MetricsMiscInfo) is now correctly
defined as a 52 byte block rather than a 28 byte one. (Alexander Thoukydides)
-
- DefMod: Error numbers corrected. (Carl Hetherington)
-
- DrawFile_Options.grid_spacing is now correctly defined as a float (Alexander Thoukydides).
-
- types.h now tests for __bool_true_false_are_defined and sets BOOL_DEFINED if
true, to provide support for inclusion of <stdbool.h> (Kevin Bracey)
-
- EventInternet_RARPReply corrected to take 2 args; the requester's address had been
omitted. (Dave Ruck)
- Corrected value of FileCore_HardDiscsCanEject. (Tom Hughes)
!
* CVS release:
! - this version is the first to be made available as a CVS archive. In preparation for this,
! some of the source directory names in OSLibSupport have been changed, and many minor changes
! have been made to the build environment. As a result of these changes, OSLib can now be fully
! built "out of the box". The CVS archive goes back to version 6.0 for historical purposes, thus
! it correctly reflects the changes to the sources since then; it is however not intended that
! early OSLib versions can be correctly re-built from these retrospective archives.
--- 38,75 ----
which had been coded in pre-ANSI C, has been replaced by a modern port of
bison. Castle 32-bit compiler. (Tony van der Hoff)
! - Defmod build is is now free of warning messages. (Tony van der Hoff)
!
* Bug Fixes:
- Font_ReadFontMetrics misc information structure (Font_MetricsMiscInfo) is now correctly
defined as a 52 byte block rather than a 28 byte one. (Alexander Thoukydides)
- DefMod: Error numbers corrected. (Carl Hetherington)
- DrawFile_Options.grid_spacing is now correctly defined as a float (Alexander Thoukydides).
- types.h now tests for __bool_true_false_are_defined and sets BOOL_DEFINED if
true, to provide support for inclusion of <stdbool.h> (Kevin Bracey)
- EventInternet_RARPReply corrected to take 2 args; the requester's address had been
omitted. (Dave Ruck)
- Corrected value of FileCore_HardDiscsCanEject. (Tom Hughes)
! - Fixes BASICTrans_Error to return a pointer to a string, not an OS_Error.
! (Ralph Corderoy)
! - Fixed sizes of FontMenu_ActionSelection and FontDbox_ActionApplyFont to
! 212 bytes from 216. (Kevin Bracey)
! - OS_CRC now takes the same data type (byte*) for both input and output.
! This is not 100% backward compatible as it may cause a compiler warning (not
! an error). (Jan-Jaap van der Geer)
! - Removed all references to OS_F in Arcweb module. 8-bit file handles were never
! supported. (Tom Hughes)
! - Fixed assembly error when including HDR.OSF32. (Philip Ludlam)
! - Fixed all instances in Iconbar.swi of Toolbox_o in favour of Toolbox_O.
! (Philip Ludlam)
!
* CVS release:
! - this version is the first to be made available as a CVS archive. In
! preparation for this, some of the source directory names in OSLibSupport
! have been changed, and many minor changes have been made to the build
! environment. As a result of these changes, OSLib can now be fully built
! "out of the box". The CVS archive goes back to version 6.0 for historical
! purposes, thus it correctly reflects the changes to the sources since then;
! it is however not intended that early OSLib versions can be correctly
! re-built from these retrospective archives.
|
|
From: <to...@us...> - 2002-11-28 13:09:03
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Types/oslib In directory sc8-pr-cvs1:/tmp/cvs-serv19925/OSLib/!OsLib/Source/Types/oslib Modified Files: OSF32.Hdr Removed Files: arcweb32.h Log Message: Various enhabcements and bug-fixes. Updated Test suite Index: OSF32.Hdr =================================================================== RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Types/oslib/OSF32.Hdr,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** OSF32.Hdr 11 Mar 2002 15:23:11 -0000 1.1 --- OSF32.Hdr 28 Nov 2002 13:09:00 -0000 1.2 *************** *** 10,14 **** [ :LNOT: :DEF: OSLIB_F8 GBLS $OS_F ! $OS_F SETS OS_FW ] --- 10,15 ---- [ :LNOT: :DEF: OSLIB_F8 GBLS $OS_F ! ;$OS_F SETS OS_FW ; TV 20021128 ! OS_F SETS OS_FW ] --- arcweb32.h DELETED --- |
|
From: <to...@us...> - 2002-11-28 13:09:02
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv19925/OSLib/!OsLib/Source/Core/oslib
Modified Files:
OS.swi OSSpriteOp.swi
Log Message:
Various enhabcements and bug-fixes. Updated Test suite
Index: OS.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib/OS.swi,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** OS.swi 23 Nov 2002 12:46:28 -0000 1.8
--- OS.swi 28 Nov 2002 13:08:59 -0000 1.9
***************
*** 1716,1720 ****
( R0 = .Int: crc_in,
R1 -> .Data: block,
! R2 -> .Char: end,
R3 = .Int: stride
),
--- 1716,1721 ----
( R0 = .Int: crc_in,
R1 -> .Data: block,
! //R2 -> .Char: end, //TV 20021128
! R2 -> .Data: end,
R3 = .Int: stride
),
Index: OSSpriteOp.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib/OSSpriteOp.swi,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OSSpriteOp.swi 23 Nov 2002 12:12:59 -0000 1.3
--- OSSpriteOp.swi 28 Nov 2002 13:08:59 -0000 1.4
***************
*** 497,500 ****
--- 497,516 ----
),
+ OSSpriteOp_ReadPixelColourDeep =
+ ( NUMBER 0x2E,
+ ENTRY
+ ( R0 # 41 "Reads pixel colour into 24-bit RGB value",
+ R0 | OSSpriteOp_Flags: flags,
+ R1 -> OSSpriteOp_Area: area,
+ R2 = OSSpriteOp_Id: id,
+ R3 = .Int: x,
+ R4 = .Int: y
+ ),
+ EXIT
+ ( R5 = .Bits: gcol,
+ R6 = OS_Tint: tint
+ )
+ ),
+
OSSpriteOp_WritePixelColour =
( NUMBER 0x2E,
***************
*** 520,523 ****
--- 536,552 ----
( R5! = .Bool: solid
)),
+
+ OSSpriteOp_WritePixelColourDeep =
+ ( NUMBER 0x2E,
+ ENTRY
+ ( R0 # 42 "Writes pixel colour using 24-bit RGB value",
+ R0 | OSSpriteOp_Flags: flags,
+ R1 = .Ref OSSpriteOp_Area: area,
+ R2 = OSSpriteOp_Id: id,
+ R3 = .Int: x,
+ R4 = .Int: y,
+ R5 = .Bits: gcol,
+ R6 = OS_Tint: tint
+ ) ),
OSSpriteOp_WritePixelMask = (NUMBER 0x2E, ENTRY (R0 # 44 "Writes pixel
|
|
From: <to...@us...> - 2002-11-27 22:11:33
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources
In directory sc8-pr-cvs1:/tmp/cvs-serv17960/OSLib/!OsLib/Tools/DefMod2/defmod/sources
Modified Files:
defmod.y
Log Message:
Changes to tools to allow builds in 32-bit environment
Index: defmod.y
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources/defmod.y,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** defmod.y 11 Mar 2002 15:08:51 -0000 1.1
--- defmod.y 27 Nov 2002 22:11:00 -0000 1.2
***************
*** 568,572 ****
TITLE: t i t l e ws {tracef ("TITLE\n");};
AUTHOR: a u t h o r ws {tracef ("AUTHOR\n");};
! NEEDS: n e e d s ws {tracef ("NEEDS\n");};
NEEDSATEND: n e e d s a t e n d ws {tracef ("NEEDSATEND\n");};
CONST: c o n s t ws {tracef ("CONST\n");};
--- 568,574 ----
TITLE: t i t l e ws {tracef ("TITLE\n");};
AUTHOR: a u t h o r ws {tracef ("AUTHOR\n");};
! /* TV 20021116 fix the 16 shift/reduce errors
! NEEDS: n e e d s ws {tracef ("NEEDS\n");};*/
! NEEDS: n e e d s ws_item_SEQUENCE {tracef ("NEEDS\n");};
NEEDSATEND: n e e d s a t e n d ws {tracef ("NEEDSATEND\n");};
CONST: c o n s t ws {tracef ("CONST\n");};
***************
*** 1067,1070 ****
--- 1069,1073 ----
output = argv [++i];
else if (strcmp (argv [i], "-help") == 0)
+ #if 0 /* TV 20021116 get rid of the macro > 10 lines warning */
{ if ((error = xos_pretty_print ("DefMod " VERSION_INFO
". Copyright © Jonathan Coxhead, 1994.\r"
***************
*** 1106,1109 ****
--- 1109,1154 ----
"\t-s\t\t" "ObjAsm source file\r",
NULL, NULL)) != NULL)
+ #else
+ { const char* helptext = "DefMod " VERSION_INFO
+ ". Copyright © Jonathan Coxhead, 1994.\r"
+ "DefMod comes with ABSOLUTELY NO WARRANTY.\r"
+ "This is free software, and you are welcome to redistribute it "
+ "under certain conditions. See the file Copying for details.\r"
+ "Usage: DefMod <type> [-v] [-help] "
+ "[-o <output-dir> | > <output-file>] "
+ "[-byte_wide <byte-wide-file>] "
+ "[-26bit | -32bit] "
+ "< <module-interface-file>\r"
+ "Purpose: generate output from a module interface file\r"
+ "-v\t\t" "verbose\r"
+ "-q\t\t" "quiet\r"
+ "-o\t\t" "is required when generating a "
+ "directory\r"
+ "<output-dir>\t" "directory to create\r"
+ "-byte_wide\t" "is required with -s or -l for a "
+ "module interface using byte-wide "
+ "types defined elsewhere\r"
+ "<byte-wide-file>\t" "file containing whitespace-separated "
+ "names of byte-wide types\r"
+ "-26bit\t\t" "generate 26 bit code" HELP_STRING_26 "\r"
+ "-32bit\t\t" "generate 32 bit code" HELP_STRING_32 "\r"
+
+ "<type> is one of:\r"
+ "\t-asmhelp\t" "SrcEdit assembler help file\r"
+ "\t-asmstrong\t" "StrongHelp assembler help "
+ "directory (not implemented)\r"
+ "\t-chelp\t\t" "SrcEdit C help file\r"
+ "\t-cstrong\t" "StrongHelp C help directory\r"
+ "\t-h\t\t" "C header file\r"
+ "\t-hdr\t\t" "ObjAsm header file\r"
+ "\t-h++\t\t" "C++ header file (experimental)\r"
+ "\t-l\t\t" "Directory for running LibFile -c "
+ "-via ViaFile\r"
+ "\t-p\t\t" "Pascal header file (not "
+ "implemented)\r"
+ "\t-s\t\t" "ObjAsm source file\r";
+
+ if ((error = xos_pretty_print (helptext, NULL, NULL)) != NULL)
+ #endif
goto finish;
}
|
|
From: <to...@us...> - 2002-11-27 22:11:33
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv17960/OSLib/!OsLib/Tools/DefMod2/defmod/oslib
Modified Files:
os.h
Log Message:
Changes to tools to allow builds in 32-bit environment
Index: os.h
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/oslib/os.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** os.h 11 Mar 2002 15:06:24 -0000 1.1
--- os.h 27 Nov 2002 22:11:00 -0000 1.2
***************
*** 121,125 ****
--- 121,133 ----
typedef struct {os_coord p [4];} os_pgm;
+ #if 0 /* TV 20021114 This was a long-standing bug;
+ a byte address is not suitable to pass to the likes of OS_Find
+ using the _swi interface. Current thinking suggests os_f
+ should be 32 bits wide in any case.
+ */
typedef byte os_f;
+ #else
+ typedef bits os_f;
+ #endif
typedef int os_var_type;
|
|
From: <to...@us...> - 2002-11-27 22:11:33
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/support
In directory sc8-pr-cvs1:/tmp/cvs-serv17960/OSLib/!OsLib/Tools/DefMod2/defmod/support
Modified Files:
resource.c
Log Message:
Changes to tools to allow builds in 32-bit environment
Index: resource.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/support/resource.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** resource.c 11 Mar 2002 15:10:39 -0000 1.1
--- resource.c 27 Nov 2002 22:11:00 -0000 1.2
***************
*** 400,406 ****
--- 400,414 ----
template->data = (char *) &template->window + size;
+ #if 0 /* TV 20021113 fixes for 32-bit tools */
if ((error = xwimp_load_template (&template->window,
template->data, template->data + data_size,
(font_f *) -1, template_name, 0, NULL, NULL, NULL)) != NULL)
+ #else
+ if ((error = xwimp_load_template (&template->window,
+ template->data, template->data + data_size,
+ (font_f *) -1, template_name, 0,
+ NULL, (int*)0, NULL
+ )) != NULL)
+ #endif
goto finish;
tracef ("loaded template \"%s\", %d icons\n" _ template_name _
|
|
From: <to...@us...> - 2002-11-27 22:11:06
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv17960/OSLib/!OsLib/docs
Modified Files:
ChangeLog
Log Message:
Changes to tools to allow builds in 32-bit environment
Index: ChangeLog
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/docs/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ChangeLog 23 Nov 2002 15:11:34 -0000 1.17
--- ChangeLog 27 Nov 2002 22:11:03 -0000 1.18
***************
*** 3,7 ****
* Enhancements:
- Defines SWI Wimp_SetIconStateFromBlock (wimp_set_icon_state_from_block) and
! TYPE Wimp_SetIconStateBlock (wimp_set_icon_state_block) to implement the native
RISC OS SWI. (Philip Ludlam)
--- 3,7 ----
* Enhancements:
- Defines SWI Wimp_SetIconStateFromBlock (wimp_set_icon_state_from_block) and
! TYPE Wimp_SetIconStateBlock (wimp_set_icon_state_block) to implement the native
RISC OS SWI. (Philip Ludlam)
***************
*** 9,13 ****
and OSSpriteOp_ReadSpriteInfo; synonymous with OSSpriteOp_ReadSpriteSize. This
reflects better the PRM descriptions. (Philip Ludlam)
!
- Added Help_FullMessageRequest, Help_FullMessageReply, Help_FullMessageEnable,
which had been omitted when full message blocks were introduced in Version 6.00.
--- 9,13 ----
and OSSpriteOp_ReadSpriteInfo; synonymous with OSSpriteOp_ReadSpriteSize. This
reflects better the PRM descriptions. (Philip Ludlam)
!
- Added Help_FullMessageRequest, Help_FullMessageReply, Help_FullMessageEnable,
which had been omitted when full message blocks were introduced in Version 6.00.
***************
*** 30,34 ****
- Updated FileCore to reflect RISC O S 5 changes, including the
addition of FileCore_DiscOp64. (Tom Hughes)
!
* Bug Fixes:
- Font_ReadFontMetrics misc information structure (Font_MetricsMiscInfo) is now correctly
--- 30,43 ----
- Updated FileCore to reflect RISC O S 5 changes, including the
addition of FileCore_DiscOp64. (Tom Hughes)
! - Distribution now includes 32-bit neutral version of OSLibSupport32
! library. (Tony van der Hoff)
!
! * Build Environment
! - OSLib may now be built under either a 26-bit or a 32-bit environment. This is
! autodetected, and the build tools are linked accordingly. To this end YACC,
! which had been coded in pre-ANSI C, has been replaced by a modern port of
! bison. Castle 32-bit compiler. (Tony van der Hoff)
!
!
* Bug Fixes:
- Font_ReadFontMetrics misc information structure (Font_MetricsMiscInfo) is now correctly
|
|
From: <to...@us...> - 2002-11-27 22:11:05
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/Yacc/1 In directory sc8-pr-cvs1:/tmp/cvs-serv17960/OSLib/!OsLib/Tools/Yacc/1 Removed Files: Yacc Yyfix Log Message: Changes to tools to allow builds in 32-bit environment --- Yacc DELETED --- --- Yyfix DELETED --- |
|
From: <to...@us...> - 2002-11-27 22:10:59
|
Update of /cvsroot/ro-oslib/OSLib In directory sc8-pr-cvs1:/tmp/cvs-serv17960/OSLib Added Files: .cvsignore Log Message: Changes to tools to allow builds in 32-bit environment --- NEW FILE: .cvsignore --- .directory |
|
From: <th...@us...> - 2002-11-23 15:15:12
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv386/Source/Core/oslib
Modified Files:
HAL.swi
Log Message:
Mark HAL calls as corrupting any of R0-R3 that they don't use for
returning results.
Index: HAL.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib/HAL.swi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HAL.swi 23 Nov 2002 12:46:28 -0000 1.1
--- HAL.swi 23 Nov 2002 15:15:09 -0000 1.2
***************
*** 18,22 ****
),
EXIT
! ( R0! = .Bool: was_enabled
) ),
--- 18,25 ----
),
EXIT
! ( R0! = .Bool: was_enabled,
! R1?,
! R2?,
! R3?
) ),
***************
*** 29,33 ****
),
EXIT
! ( R0! = .Bool: was_enabled
) ),
--- 32,39 ----
),
EXIT
! ( R0! = .Bool: was_enabled,
! R1?,
! R2?,
! R3?
) ),
***************
*** 38,41 ****
--- 44,53 ----
R8 # 0,
R9 # 3 "Clears the specified IRQ source - RISC O S 5+"
+ ),
+ EXIT
+ ( R0?,
+ R1?,
+ R2?,
+ R3?
) ),
***************
*** 47,51 ****
),
EXIT
! ( R0! = HAL_Device: device
) ),
--- 59,66 ----
),
EXIT
! ( R0! = HAL_Device: device,
! R1?,
! R2?,
! R3?
) ),
***************
*** 58,62 ****
),
EXIT
! ( R0! = .Bool: requested
) ),
--- 73,80 ----
),
EXIT
! ( R0! = .Bool: requested,
! R1?,
! R2?,
! R3?
) ),
***************
*** 69,73 ****
),
EXIT
! ( R0! = .Bool: was_enabled
) ),
--- 87,94 ----
),
EXIT
! ( R0! = .Bool: was_enabled,
! R1?,
! R2?,
! R3?
) ),
***************
*** 80,84 ****
),
EXIT
! ( R0! = .Bool: was_enabled
) ),
--- 101,108 ----
),
EXIT
! ( R0! = .Bool: was_enabled,
! R1?,
! R2?,
! R3?
) ),
***************
*** 89,92 ****
--- 113,122 ----
R8 # 0,
R9 # 8 "Masks all FIQ sources - RISC O S 5+"
+ ),
+ EXIT
+ ( R0?,
+ R1?,
+ R2?,
+ R3?
) ),
***************
*** 97,100 ****
--- 127,136 ----
R8 # 0,
R9 # 9 "Clears the specified FIQ source - RISC O S 5+"
+ ),
+ EXIT
+ ( R0?,
+ R1?,
+ R2?,
+ R3?
) ),
***************
*** 106,110 ****
),
EXIT
! ( R0! = HAL_Device: device
) ),
--- 142,149 ----
),
EXIT
! ( R0! = HAL_Device: device,
! R1?,
! R2?,
! R3?
) ),
***************
*** 117,121 ****
),
EXIT
! ( R0! = .Bool: requested
) );
--- 156,163 ----
),
EXIT
! ( R0! = .Bool: requested,
! R1?,
! R2?,
! R3?
) );
***************
*** 128,132 ****
),
EXIT
! ( R0! = .Int: timers
) ),
--- 170,177 ----
),
EXIT
! ( R0! = .Int: timers,
! R1?,
! R2?,
! R3?
) ),
***************
*** 139,143 ****
),
EXIT
! ( R0! = HAL_Device: device
) ),
--- 184,191 ----
),
EXIT
! ( R0! = HAL_Device: device,
! R1?,
! R2?,
! R3?
) ),
***************
*** 150,154 ****
),
EXIT
! ( R0! = .Int: granularity
) ),
--- 198,205 ----
),
EXIT
! ( R0! = .Int: granularity,
! R1?,
! R2?,
! R3?
) ),
***************
*** 161,165 ****
),
EXIT
! ( R0! = .Int: max_period
) ),
--- 212,219 ----
),
EXIT
! ( R0! = .Int: max_period,
! R1?,
! R2?,
! R3?
) ),
***************
*** 171,174 ****
--- 225,234 ----
R8 # 0,
R9 # 16 "Sets period of the specified timer - RISC O S 5+"
+ ),
+ EXIT
+ ( R0?,
+ R1?,
+ R2?,
+ R3?
) ),
***************
*** 181,185 ****
),
EXIT
! ( R0! = .Int: period
) ),
--- 241,248 ----
),
EXIT
! ( R0! = .Int: period,
! R1?,
! R2?,
! R3?
) ),
***************
*** 192,196 ****
),
EXIT
! ( R0! = .Int: time_remaining
) );
--- 255,262 ----
),
EXIT
! ( R0! = .Int: time_remaining,
! R1?,
! R2?,
! R3?
) );
***************
*** 203,207 ****
),
EXIT
! ( R0! = .Int: rate
) ),
--- 269,276 ----
),
EXIT
! ( R0! = .Int: rate,
! R1?,
! R2?,
! R3?
) ),
***************
*** 213,217 ****
),
EXIT
! ( R0! = .Int: period
) ),
--- 282,289 ----
),
EXIT
! ( R0! = .Int: period,
! R1?,
! R2?,
! R3?
) ),
***************
*** 223,227 ****
),
EXIT
! ( R0! = .Int: period
) ),
--- 295,302 ----
),
EXIT
! ( R0! = .Int: period,
! R1?,
! R2?,
! R3?
) ),
***************
*** 232,234 ****
--- 307,315 ----
R8 # 0,
R9 # 22 "Delay for at least the specified number of microseconds - RISC O S 5+"
+ ),
+ EXIT
+ ( R0?,
+ R1?,
+ R2?,
+ R3?
) )
|
|
From: <th...@us...> - 2002-11-23 15:11:36
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv30815/docs
Modified Files:
ChangeLog
Log Message:
Updated FileCore for changes in RISC O S 5 including the addition
of FileCore_DiscOp64. Also fixed an incorrect flag value, and added
some missing flags from RISC O S 3.6 additions.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/docs/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ChangeLog 23 Nov 2002 12:46:28 -0000 1.16
--- ChangeLog 23 Nov 2002 15:11:34 -0000 1.17
***************
*** 28,31 ****
--- 28,33 ----
ImageRender and CMYK sprite support. (Tom Hughes)
- Added the RISC O S 5 HAL Interface. (Tom Hughes)
+ - Updated FileCore to reflect RISC O S 5 changes, including the
+ addition of FileCore_DiscOp64. (Tom Hughes)
* Bug Fixes:
***************
*** 42,45 ****
--- 44,48 ----
- EventInternet_RARPReply corrected to take 2 args; the requester's address had been
omitted. (Dave Ruck)
+ - Corrected value of FileCore_HardDiscsCanEject. (Tom Hughes)
* CVS release:
|
|
From: <th...@us...> - 2002-11-23 15:11:36
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Computer/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv30815/Source/Computer/oslib
Modified Files:
FileCore.swi
Log Message:
Updated FileCore for changes in RISC O S 5 including the addition
of FileCore_DiscOp64. Also fixed an incorrect flag value, and added
some missing flags from RISC O S 3.6 additions.
Index: FileCore.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Computer/oslib/FileCore.swi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileCore.swi 11 Mar 2002 14:12:29 -0000 1.2
--- FileCore.swi 23 Nov 2002 15:11:33 -0000 1.3
***************
*** 24,28 ****
FileCore_HardDiscsCanPollChange = .Bits: %100000,
FileCore_FloppiesCanEject = .Bits: %1000000,
! FileCore_HardDiscsCanEject = .Bits: %100000000;
TYPE
--- 24,31 ----
FileCore_HardDiscsCanPollChange = .Bits: %100000,
FileCore_FloppiesCanEject = .Bits: %1000000,
! FileCore_HardDiscsCanEject = .Bits: %10000000,
! FileCore_SupportsReadDriveFlags = .Bits: %100000000 "RISC O S 3.6+",
! FileCore_UseSectorAddressing = .Bits: %1000000000 "RISC O S 3.6+",
! FileCore_ReturnsNewStyleErrors = .Bits: %10000000000 "RISC O S 5+";
TYPE
***************
*** 66,69 ****
--- 69,81 ----
TYPE
+ FileCore_DiscAddress64 =
+ .Struct
+ ( .Byte: drive,
+ [3] .Byte: reserved,
+ .Int: offset_low,
+ .Int: offset_high
+ );
+
+ TYPE
FileCore_Format =
.Struct
***************
*** 432,435 ****
--- 444,526 ----
R8 = .Ref Void: instance), EXIT (R0 = .Bits: free_lo,
R1 = .Int: free_hi, R2 = .Int: max));
+
+ SWI FileCore_DiscOp64 = (NUMBER 0x4054C "Performs various operations on a
+ disc - see individual reason codes - RISC O S 5+", ABSENT);
+ SWI FileCoreDiscOp64_Verify = (NUMBER 0x4054C,
+ ENTRY (R1 # 0 "Verifies a disc - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 = .Ref FileCore_DiscAddress64: disc_addr, R4 = .Int: size,
+ R8 = .Ref Void: instance),
+ EXIT (R2 = .Ref FileCore_DiscAddress64: next_disc_addr,
+ R4! = .Int: unverified));
+ SWI FileCoreDiscOp64_ReadSectors = (NUMBER 0x4054C,
+ ENTRY (R1 # 1 "Reads sectors from a disc - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 = .Ref FileCore_DiscAddress64: disc_addr, R3 = .Ref .Data: data,
+ R4 = .Int: size, R8 = .Ref Void: instance),
+ EXIT (R2 = .Ref FileCore_DiscAddress64: next_disc_addr,
+ R3 = .Ref .Data: next_data,
+ R4! = .Int: unread));
+ SWI FileCoreDiscOp64_WriteSectors = (NUMBER 0x4054C,
+ ENTRY (R1 # 2 "Writes sectors to a disc - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 = .Ref FileCore_DiscAddress64: disc_addr, R3 -> .Data: data,
+ R4 = .Int: size, R8 = .Ref Void: instance),
+ EXIT (R2 = .Ref FileCore_DiscAddress64: next_disc_addr,
+ R3 -> .Data: next_data,
+ R4! = .Int: unwritten));
+ SWI FileCoreDiscOp64_ReadTrack = (NUMBER 0x4054C,
+ ENTRY (R1 # 3 "Reads a track from a floppy disc - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 -> FileCore_DiscAddress64: disc_addr, R3 = .Ref .Data: data,
+ R8 = .Ref Void: instance));
+ SWI FileCoreDiscOp64_ReadId = (NUMBER 0x4054C,
+ ENTRY (R1 # 3 "Reads a hard disc ID - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 -> FileCore_DiscAddress64: disc_addr, R3 = .Ref .Data: data,
+ R8 = .Ref Void: instance));
+ SWI FileCoreDiscOp64_WriteTrack = (NUMBER 0x4054C,
+ ENTRY (R1 # 4 "Writes a track to a disc - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 -> FileCore_DiscAddress64: disc_addr, R3 -> .Data: data,
+ R8 = .Ref Void: instance));
+ SWI FileCoreDiscOp64_FormatTrack = (NUMBER 0x4054C,
+ ENTRY (R1 # 4 "Formats a track of a disc - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 -> FileCore_DiscAddress64: disc_addr, R3 # 0,
+ R4 -> FileCore_TrackFormat: track_format,
+ R8 = .Ref Void: instance));
+ SWI FileCoreDiscOp64_Seek = (NUMBER 0x4054C,
+ ENTRY (R1 # 5 "Seeks to a disc location - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 -> FileCore_DiscAddress64: disc_addr,
+ R8 = .Ref Void: instance));
+ SWI FileCoreDiscOp64_Restore = (NUMBER 0x4054C,
+ ENTRY (R1 # 6 "Does a restore operation for a disc - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 -> FileCore_DiscAddress64: disc_addr,
+ R8 = .Ref Void: instance));
+ SWI FileCoreDiscOp64_StepIn = (NUMBER 0x4054C,
+ ENTRY (R1 # 7 "Steps a floppy disc in one track - RISC O S 5+",
+ R1 | .Bits: flags,
+ R8 = .Ref Void: instance));
+ SWI FileCoreDiscOp64_StepOut = (NUMBER 0x4054C,
+ ENTRY (R1 # 8 "Steps a floppy disc out one track - RISC O S 5+",
+ R1 | .Bits: flags,
+ R8 = .Ref Void: instance));
+ SWI FileCoreDiscOp64_ReadSectorsViaCache = (NUMBER 0x4054C,
+ ENTRY (R1 # 9 "Reads sectors of a disc using the RMA cache - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 = .Ref FileCore_DiscAddress64: disc_addr, R3 = .Ref .Data: data,
+ R4 = .Int: size, R6 = .Int: cache_handle,
+ R8 = .Ref Void: instance),
+ EXIT (R2 = .Ref FileCore_DiscAddress64: next_disc_addr,
+ R3 = .Ref .Data: next_data,
+ R4! = .Int: unread, R6 = .Int: cache_handle_out));
+ SWI FileCoreDiscOp64_Specify = (NUMBER 0x4054C,
+ ENTRY (R1 # 15 "Does a specify operation on a hard disc - RISC O S 5+",
+ R1 | .Bits: flags,
+ R2 -> FileCore_DiscAddress64: disc_addr,
+ R8 = .Ref Void: instance));
SWI
|
|
From: <th...@us...> - 2002-11-23 12:46:31
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib In directory sc8-pr-cvs1:/tmp/cvs-serv24194/Source/Core/oslib Modified Files: OS.swi Added Files: HAL.swi Log Message: Added the RISC O S 5 HAL interface based on details at www.iyonix.com/32bit. --- NEW FILE: HAL.swi --- TITLE HAL; AUTHOR "Tom Hughes, to...@co..., 23 Nov 2002"; NEEDS OS; TYPE HAL_Device = .Int, HAL_Timer = .Int; SWI HAL_IRQEnable = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Device: device, R8 # 0, R9 # 1 "Unmasks the specified IRQ source - RISC O S 5+" ), EXIT ( R0! = .Bool: was_enabled ) ), HAL_IRQDisable = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Device: device, R8 # 0, R9 # 2 "Masks the specified IRQ source - RISC O S 5+" ), EXIT ( R0! = .Bool: was_enabled ) ), HAL_IRQClear = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Device: device, R8 # 0, R9 # 3 "Clears the specified IRQ source - RISC O S 5+" ) ), HAL_IRQSource = ( NUMBER 0x7A, ENTRY ( R8 # 0, R9 # 4 "Returns the number of the highest priority asserted IRQ - RISC O S 5+" ), EXIT ( R0! = HAL_Device: device ) ), HAL_IRQStatus = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Device: device, R8 # 0, R9 # 5 "Returns non-zero if the specified device is requesting an IRQ - RISC O S 5+" ), EXIT ( R0! = .Bool: requested ) ), HAL_FIQEnable = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Device: device, R8 # 0, R9 # 6 "Unmasks the specified FIQ source - RISC O S 5+" ), EXIT ( R0! = .Bool: was_enabled ) ), HAL_FIQDisable = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Device: device, R8 # 0, R9 # 7 "Masks the specified FIQ source - RISC O S 5+" ), EXIT ( R0! = .Bool: was_enabled ) ), HAL_FIQDisableAll = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Device: device, R8 # 0, R9 # 8 "Masks all FIQ sources - RISC O S 5+" ) ), HAL_FIQClear = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Device: device, R8 # 0, R9 # 9 "Clears the specified FIQ source - RISC O S 5+" ) ), HAL_FIQSource = ( NUMBER 0x7A, ENTRY ( R8 # 0, R9 # 10 "Returns the number of the highest priority asserted FIQ - RISC O S 5+" ), EXIT ( R0! = HAL_Device: device ) ), HAL_FIQStatus = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Device: device, R8 # 0, R9 # 11 "Returns non-zero if the specified device is requesting an FIQ - RISC O S 5+" ), EXIT ( R0! = .Bool: requested ) ); SWI HAL_Timers = ( NUMBER 0x7A, ENTRY ( R8 # 0, R9 # 12 "Returns number of timers - RISC O S 5+" ), EXIT ( R0! = .Int: timers ) ), HAL_TimerDevice = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Timer: timer, R8 # 0, R9 # 13 "Returns IRQ device number of the specified timer - RISC O S 5+" ), EXIT ( R0! = HAL_Device: device ) ), HAL_TimerGranularity = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Timer: timer, R8 # 0, R9 # 14 "Returns basic granularity of the specified timer in ticks per second - RISC O S 5+" ), EXIT ( R0! = .Int: granularity ) ), HAL_TimerMaxPeriod = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Timer: timer, R8 # 0, R9 # 15 "Returns maximum period of the specified timer - RISC O S 5+" ), EXIT ( R0! = .Int: max_period ) ), HAL_TimerSetPeriod = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Timer: timer, R1 = .Int: period, R8 # 0, R9 # 16 "Sets period of the specified timer - RISC O S 5+" ) ), HAL_TimerPeriod = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Timer: timer, R8 # 0, R9 # 17 "Reads period of the specified timer - RISC O S 5+" ), EXIT ( R0! = .Int: period ) ), HAL_TimerReadCountdown = ( NUMBER 0x7A, ENTRY ( R0 = HAL_Timer: timer, R8 # 0, R9 # 18 "Returns the time until the next interrupt for the specified timer - RISC O S 5+" ), EXIT ( R0! = .Int: time_remaining ) ); SWI HAL_CounterRate = ( NUMBER 0x7A, ENTRY ( R8 # 0, R9 # 19 "Returns the rate of the counter in ticks per second - RISC O S 5+" ), EXIT ( R0! = .Int: rate ) ), HAL_CounterPeriod = ( NUMBER 0x7A, ENTRY ( R8 # 0, R9 # 20 "Returns the period of the counter in ticks - RISC O S 5+" ), EXIT ( R0! = .Int: period ) ), HAL_CounterRead = ( NUMBER 0x7A, ENTRY ( R8 # 0, R9 # 21 "Reads the current counter value - RISC O S 5+" ), EXIT ( R0! = .Int: period ) ), HAL_CounterDelay = ( NUMBER 0x7A, ENTRY ( R0 = .Int: delay, R8 # 0, R9 # 22 "Delay for at least the specified number of microseconds - RISC O S 5+" ) ) Index: OS.swi =================================================================== RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib/OS.swi,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** OS.swi 23 Nov 2002 12:12:59 -0000 1.7 --- OS.swi 23 Nov 2002 12:46:28 -0000 1.8 *************** *** 2282,2285 **** --- 2282,2326 ---- ( NUMBER 0x74 "Enter 26 bit user mode - RISC O S 4+"); + TYPE OS_HardwareFlags = .Bits; + + SWI OS_Hardware = + ( NUMBER 0x7A "Provides access to the hardware layer - RISC O S 5+", + ABSENT + ); + + SWI OS_HardwareCallHAL = + ( NUMBER 0x7A, + ENTRY + ( R0 = .Int: arg1, + R1 = .Int: arg2, + R2 = .Int: arg3, + R3 = .Int: arg4, + R4 = .Int: arg5, + R5 = .Int: arg6, + R6 = .Int: arg7, + R7 = .Int: arg8, + R8 | OS_HardwareFlags: flags, + R8 # 0 "Calls a HAL routine - RISC O S 5+", + R9 = .Int: call + ), + EXIT + ( R0 = .Int: result1, + R1 = .Int: result2, + R2 = .Int: result3, + R3 = .Int: result4 + ) ); + + SWI OS_HardwareFindHALRoutine = + ( NUMBER 0x7A, + ENTRY + ( R8 | OS_HardwareFlags: flags, + R8 # 1 "Finds the address of a HAL routine - RISC O S 5+", + R9 = .Int: call + ), + EXIT + ( R0! = .Ref .Asm: routine, + R1 = .Int: static_base + ) ); + SWI OS_ConvertStandardDateAndTime = ( NUMBER 0xC0 "Converts a 5-byte time into a string - prefer |
|
From: <th...@us...> - 2002-11-23 12:46:31
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/docs In directory sc8-pr-cvs1:/tmp/cvs-serv24194/docs Modified Files: ChangeLog Log Message: Added the RISC O S 5 HAL interface based on details at www.iyonix.com/32bit. Index: ChangeLog =================================================================== RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/docs/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ChangeLog 23 Nov 2002 12:13:00 -0000 1.15 --- ChangeLog 23 Nov 2002 12:46:28 -0000 1.16 *************** *** 27,30 **** --- 27,31 ---- including the addition of BlendTable, InverseTable, ConvertPNG and ImageRender and CMYK sprite support. (Tom Hughes) + - Added the RISC O S 5 HAL Interface. (Tom Hughes) * Bug Fixes: |
|
From: <th...@us...> - 2002-11-23 12:13:04
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv11194/docs
Modified Files:
ChangeLog
Log Message:
Various updates to graphics related calls to reflect changes made
in Select, including the addition of BlendTable, InverseTable, ConverPNG
and ImageRender and the addition of CMYK sprite support.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/docs/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ChangeLog 20 Nov 2002 19:40:59 -0000 1.14
--- ChangeLog 23 Nov 2002 12:13:00 -0000 1.15
***************
*** 24,27 ****
--- 24,30 ----
- Added Reboot and PowerOff flags for TaskManager_Shutdown. (Tom Hughes)
- Added WimpTextOp_StringWidthWithFlags. (Tom Hughes)
+ - Updated to reflect various changed in the graphics system in Select
+ including the addition of BlendTable, InverseTable, ConvertPNG and
+ ImageRender and CMYK sprite support. (Tom Hughes)
* Bug Fixes:
|
|
From: <th...@us...> - 2002-11-23 12:13:03
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv11194/Source/User/oslib
Modified Files:
CompressJPEG.swi DrawFile.swi JPEG.swi
Added Files:
ConvertPNG.swi ImageFileRender.swi
Log Message:
Various updates to graphics related calls to reflect changes made
in Select, including the addition of BlendTable, InverseTable, ConverPNG
and ImageRender and the addition of CMYK sprite support.
--- NEW FILE: ConvertPNG.swi ---
TITLE ConvertPNG;
AUTHOR "Tom Hughes, to...@co..., 21 Nov 2002";
NEEDS OS;
TYPE
ConvertPNG_InfoFlags = .Bits;
TYPE
ConvertPNG_CreateSpriteFlags = .Bits;
CONST
ConvertPNG_CreateSpriteArea = ConvertPNG_CreateSpriteFlags: 0x1,
ConvertPNG_UseBackground = ConvertPNG_CreateSpriteFlags: 0x2;
TYPE
ConvertPNG_ColourType = .Bits;
CONST
ConvertPNG_HasPalette = ConvertPNG_ColourType: 0x1,
ConvertPNG_IsColour = ConvertPNG_ColourType: 0x2,
ConvertPNG_HasAlphaChannel = ConvertPNG_ColourType: 0x4;
TYPE
ConvertPNG_InterlaceType = .Bits;
CONST
ConvertPNG_NoInterlacing = ConvertPNG_InterlaceType: 0x1,
ConvertPNG_Adam7Interlacing = ConvertPNG_InterlaceType: 0x2;
SWI
ConvertPNG_Info =
( NUMBER 0x564C0 "Read information about a PNG image - RISC O S 4.32+",
ENTRY
( R0 = ConvertPNG_InfoFlags: flags,
R1 -> .Data: buffer,
R2 = .Int: size
),
EXIT
( R0 = .Int: width,
R1 = .Int: height,
R2 = .Int: bpp,
R3 = ConvertPNG_ColourType: colour_type,
R4 = ConvertPNG_InterlaceType: interlace_type
) ),
ConvertPNG_CreateSprite =
( NUMBER 0x564C1 "Create a sprite from a PNG image - RISC O S 4.32+",
ENTRY
( R0 = ConvertPNG_CreateSpriteFlags: flags,
R1 -> .Data: input_buffer,
R2 = .Int: input_size,
R3 = .Ref .Data: output_buffer,
R4 = .Int: output_size,
R5 = OS_Colour: background
),
EXIT
( R4! = .Int: size
) )
--- NEW FILE: ImageFileRender.swi ---
TITLE ImageFileRender;
AUTHOR "Tom Hughes, to...@co..., 22 Nov 2002";
NEEDS OS, OSSpriteOp, PDriver;
TYPE
ImageFileRender_SequenceNumber = .Int;
CONST
ImageFileRender_DefaultImage = ImageFileRender_SequenceNumber: 0;
TYPE
ImageFileRender_FitBlock =
.Struct
( .Int: width,
.Int: height,
.Int: border,
.Int: angle
);
TYPE
ImageFileRender_TransformationData =
.Union
(
ImageFileRender_FitBlock: to_fit,
OS_Factors: scaled,
OS_Trfm: transformed
);
TYPE
ImageFileRender_QueryType = .Int;
CONST
ImageFileRender_BaseDetails = ImageFileRender_QueryType: 0;
TYPE
ImageFileRender_ImageFlags = .Bits;
CONST
ImageFileRender_ImageIsSolid = ImageFileRender_ImageFlags: 0x1;
TYPE
ImageFileRender_BaseDetails =
.Struct
( ImageFileRender_SequenceNumber: sequence,
.Int: xdpi,
.Int: ydpi,
OSSpriteOp_ModeWord: colour_type,
ImageFileRender_ImageFlags: image_flags
);
TYPE
ImageFileRender_Flags = .Bits;
CONST
ImageFileRender_TransformationType = ImageFileRender_Flags: 0x7,
ImageFileRender_TransformationTypeShift = .Int: 0,
ImageFileRender_RenderToFit = .Int: 0,
ImageFileRender_RenderScaled = .Int: 1,
ImageFileRender_RenderTransformed = .Int: 2,
ImageFileRender_ColourMappingSupplied = ImageFileRender_Flags: 0x8,
ImageFileRender_IgnoreDocumentOrigin = ImageFileRender_Flags: 0x10,
ImageFileRender_ReturnOSUnits = ImageFileRender_Flags: 0x20,
ImageFileRender_Quality = ImageFileRender_Flags: 0x1C0,
ImageFileRender_QualityShift = .Int: 6,
ImageFileRender_DefaultQuality = .Int: 0,
ImageFileRender_LowestQuality = .Int: 1,
ImageFileRender_HighestQuality = .Int: 15;
TYPE
ImageFileRender_RendererFlags = .Bits;
CONST
ImageFileRender_TransformationCapabilities = ImageFileRender_RendererFlags: 0x3,
ImageFileRender_TransformationCapabilitiesShift = .Int: 0,
ImageFileRender_NoTransformation = .Int: 0,
ImageFileRender_FixedAspectRatio = .Int: 1,
ImageFileRender_AnyAspectRatio = .Int: 2,
ImageFileRender_AnyTransformation = .Int: 3,
ImageFileRender_SupportsColourMapping = ImageFileRender_RendererFlags: 0x4,
ImageFileRender_SupportsIrregularShapes = ImageFileRender_RendererFlags: 0x8,
ImageFileRender_MaximumQualityLevel = ImageFileRender_RendererFlags: 0xF0,
ImageFileRender_MaximumQualityLevelShift = .Int: 4,
ImageFileRender_DefaultQualityLevel = ImageFileRender_RendererFlags: 0xF00,
ImageFileRender_DefaultQualityLevelShift = .Int: 8;
TYPE
ImageFileRender_Magic;
TYPE
ImageFileRender_Renderer =
.Struct
( .Int: api_version,
ImageFileRender_RendererFlags: flags,
.Bits: file_type,
ImageFileRender_Magic: magic,
.Ref .Char: name,
.Ref .Data: workspace,
.Ref .Asm: start,
.Ref .Asm: stop,
.Ref .Asm: render,
.Ref .Asm: bbox,
.Ref .Asm: declare_fonts,
.Ref .Asm: info
);
TYPE
ImageFileRender_ImageDescriptor =
.Struct
( .Ref .Data: data,
.Int: size,
.Ref .Data: extension_data,
ImageFileRender_SequenceNumber: sequence,
.Ref .Data: private_data
);
TYPE
ImageFileRender_RenderingDescriptor =
.Struct
( ImageFileRender_Flags: flags,
OS_Trfm: trfm,
OS_Box: bbox,
OSSpriteOp_ColourMapping: mapping
);
TYPE
ImageFileRender_BBoxDescriptor =
.Struct
( ImageFileRender_Flags: flags,
OS_Trfm: trfm,
OS_Box: bbox
);
TYPE
ImageFileRender_DeclareFontsDescriptor =
.Struct
( ImageFileRender_Flags: flags,
PDriver_FontFlags: pdriver_flags
);
TYPE
ImageFileRender_InfoDescriptor =
.Struct
( ImageFileRender_QueryType: query,
.Int: size,
.Ref .Data: data
);
SWI
ImageFileRender_Render =
( NUMBER 0x562C0 "Render an image file",
ENTRY
( R0 = ImageFileRender_Flags: flags,
R1 = .Bits: file_type,
R2 -> .Data: data,
R3 = .Int: size,
R4 -> .Data: extension_data,
R5 = ImageFileRender_SequenceNumber: sequence,
R6 = .Int: xorigin,
R7 = .int: yorigin,
R8 -> ImageFileRender_TransformationData: transformation_data,
R9 -> OSSpriteOp_ColourMapping: colour_mapping
) ),
ImageFileRender_BBox =
( NUMBER 0x562C1 "Calculate the bounding box for a transformation operation",
ENTRY
( R0 = ImageFileRender_Flags: flags,
R1 = .Bits: file_type,
R2 -> .Data: data,
R3 = .Int: size,
R4 -> .Data: extension_data,
R5 = ImageFileRender_SequenceNumber: sequence,
R6 -> ImageFileRender_TransformationData: transformation_data,
R7 = .Ref OS_Box: bbox
) ),
ImageFileRender_Transform =
( NUMBER 0x562C2 "Calculate the transformation matrix for an operation",
ENTRY
( R0 = ImageFileRender_Flags: flags,
R1 = .Bits: file_type,
R2 -> .Data: data,
R3 = .Int: size,
R4 -> .Data: extension_data,
R5 = ImageFileRender_SequenceNumber: sequence,
R6 -> ImageFileRender_TransformationData: transformation_data,
R7 = .Ref OS_Trfm: trfm
),
EXIT
( R0 = .Int: xdpi,
R1 = .Int: ydpi
) ),
ImageFileRender_DeclareFonts =
( NUMBER 0x562C3 "Declare fonts used by an image when printing",
ENTRY
( R0 = ImageFileRender_Flags: flags,
R1 = .Bits: file_type,
R2 -> .Data: data,
R3 = .Int: size,
R4 -> .Data: extension_data,
R5 = ImageFileRender_SequenceNumber: sequence,
R6 = PDriver_FontFlags: pdriver_flags
) ),
ImageFileRender_Info =
( NUMBER 0x562C4 "Return information on an image",
ENTRY
( R0 = ImageFileRender_Flags: flags,
R1 = .Bits: file_type,
R2 -> .Data: data,
R3 = .Int: size,
R4 -> .Data: extension_data,
R5 = ImageFileRender_SequenceNumber: sequence,
R6 = ImageFileRender_QueryType: query,
R7 = .Ref .Data: query_data,
R8 = .Int: query_data_size
),
EXIT
( R8! = .Int: size_used
) ),
ImageFileRender_InfoBaseDetails =
( NUMBER 0x562C4,
ENTRY
( R0 = ImageFileRender_Flags: flags,
R1 = .Bits: file_type,
R2 -> .Data: data,
R3 = .Int: size,
R4 -> .Data: extension_data,
R5 = ImageFileRender_SequenceNumber: sequence,
R6 # ImageFileRender_BaseDetails "Return basic information on an image",
R7 = .Ref ImageFileRender_BaseDetails: base_details,
R8 = .Int: base_details_size
),
EXIT
( R8! = .Int: size_used
) ),
ImageFileRender_RendererInfo =
( NUMBER 0x562C5 "Return information about a renderer",
ENTRY
( R0 = ImageFileRender_Flags: flags,
R1 = .Bits: file_type,
R2 = ImageFileRender_Magic: magic
),
EXIT
( R0! -> ImageFileRender_Renderer: definition,
R1 = .Ref .Char: name
) ),
ImageFileRender_Register =
( NUMBER 0x562C6 "Register a new renderer",
ENTRY
( R0 = ImageFileRender_Flags: flags,
R1 -> ImageFileRender_Renderer: definition
),
EXIT
( R1! = .Int: api_version
) ),
ImageFileRender_Deregister =
( NUMBER 0x562C7 "Deregister a renderer",
ENTRY
( R0 = ImageFileRender_Flags: flags,
R1 = .Bits: file_type,
R2 -> .Char: name,
R3 = ImageFileRender_Magic: magic
),
EXIT
( R1! = .Int: api_version
) );
SWI
Service_ImageFileRenderStarted =
( NUMBER 0x30,
ENTRY
( R0 = .Int: api_version,
R1 # 0x80D40 "ImageFileRender module has initialised"
) ),
Service_ImageFileRenderDying =
( NUMBER 0x30,
ENTRY
( R0 = .Int: api_version,
R1 # 0x80D41 "ImageFileRender module is finalising"
) ),
Service_ImageFileRenderRendererChanged =
( NUMBER 0x30,
ENTRY
( R0 = .Int: api_version,
R1 # 0x80D42 "Renderer changed",
R2 = .Bits: file_type
) )
Index: CompressJPEG.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib/CompressJPEG.swi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompressJPEG.swi 22 Sep 2002 15:59:15 -0000 1.2
--- CompressJPEG.swi 23 Nov 2002 12:13:00 -0000 1.3
***************
*** 19,24 ****
TYPE
CompressJPEG_CommentFlags = .Bits,
! CompressJPEG_WriteLineFlags = .Bits;
CONST
--- 19,41 ----
TYPE
+ CompressJPEG_ScanDescription =
+ .Struct
+ ( .Int: scan_count,
+ .Struct
+ ( .Int: components,
+ .Int: r,
+ .Int: g,
+ .Int: b,
+ .Int: ss,
+ .Int: se,
+ .Int: ah,
+ .Int: al
+ ): scan_data ...
+ );
+
+ TYPE
CompressJPEG_CommentFlags = .Bits,
! CompressJPEG_WriteLineFlags = .Bits,
! CompressJPEG_TranscodeFlags = .Bits;
CONST
***************
*** 38,41 ****
--- 55,155 ----
CompressJPEG_IsRGB = CompressJPEG_WriteLineFlags: 0x20;
+ CONST
+ CompressJPEG_GenerateProgressive = CompressJPEG_TranscodeFlags: 0b1,
+ CompressJPEG_OperationOnUnknowns = CompressJPEG_TranscodeFlags: 0b110,
+ CompressJPEG_OperationOnUnknownsShift = .Int: 1,
+ CompressJPEG_TransformationType = CompressJPEG_TranscodeFlags: 0b1111000,
+ CompressJPEG_TransformationTypeShift = .Int: 3,
+ CompressJPEG_TrimEdges = CompressJPEG_TranscodeFlags: 0b10000000,
+ CompressJPEG_GenerateGreyscale = CompressJPEG_TranscodeFlags: 0b100000000,
+ CompressJPEG_OptimiseForSmaller = CompressJPEG_TranscodeFlags: 0b1000000000;
+
+ CONST
+ CompressJPEG_CopyNoAdditional = CompressJPEG_TranscodeFlags: 0 "shift by CompressJPEG_OperationOnUnknownsShift",
+ CompressJPEG_CopyComments = CompressJPEG_TranscodeFlags: 1 "shift by CompressJPEG_OperationOnUnknownsShift",
+ CompressJPEG_CopyAllElements = CompressJPEG_TranscodeFlags: 3 "shift by CompressJPEG_OperationOnUnknownsShift";
+
+ CONST
+ CompressJPEG_NoTransformation = CompressJPEG_TranscodeFlags: 0 "shift by CompressJPEG_TransformationTypeShift",
+ CompressJPEG_FlipHorizontally = CompressJPEG_TranscodeFlags: 1 "shift by CompressJPEG_TransformationTypeShift",
+ CompressJPEG_FlipVertically = CompressJPEG_TranscodeFlags: 2 "shift by CompressJPEG_TransformationTypeShift",
+ CompressJPEG_Rotate90Clockwise = CompressJPEG_TranscodeFlags: 3 "shift by CompressJPEG_TransformationTypeShift",
+ CompressJPEG_Rotate180 = CompressJPEG_TranscodeFlags: 4 "shift by CompressJPEG_TransformationTypeShift",
+ CompressJPEG_Rotate90AntiClockwise = CompressJPEG_TranscodeFlags: 5 "shift by CompressJPEG_TransformationTypeShift",
+ CompressJPEG_Transpose = CompressJPEG_TranscodeFlags: 6 "shift by CompressJPEG_TransformationTypeShift",
+ CompressJPEG_TransverseTranspose = CompressJPEG_TranscodeFlags: 7 "shift by CompressJPEG_TransformationTypeShift";
+
+
+ CONST
+ Error_CompressJPEGBadBPP = .Bits: 0x8183C0,
+ Error_CompressJPEGBadLineCount = .Bits: 0x8183C1,
+ Error_CompressJPEGBadBuffer = .Bits: 0x8183C2,
+ Error_CompressJPEGBadSize = .Bits: 0x8183C3;
+
+ CONST
+ Error_CompressJPEGArithNotImpl = .Bits: 0x81A881,
+ Error_CompressJPEGBadAlignType = .Bits: 0x81A882,
+ Error_CompressJPEGBadAllocChunk = .Bits: 0x81A883,
+ Error_CompressJPEGBadBufferMode = .Bits: 0x81A884,
+ Error_CompressJPEGBadComponentID = .Bits: 0x81A885,
+ Error_CompressJPEGBadDctSize = .Bits: 0x81A886,
+ Error_CompressJPEGBadInColourSpace = .Bits: 0x81A887,
+ Error_CompressJPEGBadKColourSpace = .Bits: 0x81A888,
+ Error_CompressJPEGBadLength = .Bits: 0x81A889,
+ Error_CompressJPEGBadMCUSize = .Bits: 0x81A88A,
+ Error_CompressJPEGBadPoolID = .Bits: 0x81A88B,
+ Error_CompressJPEGBadPrecision = .Bits: 0x81A88C,
+ Error_CompressJPEGBadSampling = .Bits: 0x81A88D,
+ Error_CompressJPEGBadState = .Bits: 0x81A88E,
+ Error_CompressJPEGBadVirtualAccess = .Bits: 0x81A88F,
+ Error_CompressJPEGBufferSize = .Bits: 0x81A890,
+ Error_CompressJPEGCantSuspend = .Bits: 0x81A891,
+ Error_CompressJPEGCCIR601NotImpl = .Bits: 0x81A892,
+ Error_CompressJPEGComponentCount = .Bits: 0x81A893,
+ Error_CompressJPEGConversionNotImpl = .Bits: 0x81A894,
+ Error_CompressJPEGDACIndex = .Bits: 0x81A895,
+ Error_CompressJPEGDACValue = .Bits: 0x81A896,
+ Error_CompressJPEGDHTIndex = .Bits: 0x81A897,
+ Error_CompressJPEGDQTIndex = .Bits: 0x81A898,
+ Error_CompressJPEGEmptyImage = .Bits: 0x81A899,
+ Error_CompressJPEGEOIExpected = .Bits: 0x81A89A,
+ Error_CompressJPEGFileRead = .Bits: 0x81A89B,
+ Error_CompressJPEGFileWrite = .Bits: 0x81A89C,
+ Error_CompressJPEGFractSampleNotImpl = .Bits: 0x81A89D,
+ Error_CompressJPEGHuffCLenOverflow = .Bits: 0x81A89E,
+ Error_CompressJPEGHuffMissingCode = .Bits: 0x81A89F,
+ Error_CompressJPEGImageTooBig = .Bits: 0x81A8A0,
+ Error_CompressJPEGInputEmpty = .Bits: 0x81A8A1,
+ Error_CompressJPEGInputEOF = .Bits: 0x81A8A2,
+ Error_CompressJPEGNotImpl = .Bits: 0x81A8A3,
+ Error_CompressJPEGNotCompiled = .Bits: 0x81A8A4,
+ Error_CompressJPEGNoBackingStore = .Bits: 0x81A8A5,
+ Error_CompressJPEGNoHuffTable = .Bits: 0x81A8A6,
+ Error_CompressJPEGNoImage = .Bits: 0x81A8A7,
+ Error_CompressJPEGNoQuantTable = .Bits: 0x81A8A8,
+ Error_CompressJPEGNoSOI = .Bits: 0x81A8A9,
+ Error_CompressJPEGOutOfMemory = .Bits: 0x81A8AA,
+ Error_CompressJPEGQuantComponents = .Bits: 0x81A8AB,
+ Error_CompressJPEGQuantFewColours = .Bits: 0x81A8AC,
+ Error_CompressJPEGQuantManyColours = .Bits: 0x81A8AD,
+ Error_CompressJPEGSOFDuplicate = .Bits: 0x81A8AE,
+ Error_CompressJPEGSOFNoSOS = .Bits: 0x81A8AF,
+ Error_CompressJPEGSOFUnsupported = .Bits: 0x81A8B0,
+ Error_CompressJPEGSOIDuplicate = .Bits: 0x81A8B1,
+ Error_CompressJPEGSOSNoSOF = .Bits: 0x81A8B2,
+ Error_CompressJPEGTooLittleData = .Bits: 0x81A8B3,
+ Error_CompressJPEGUnknownMarker = .Bits: 0x81A8B4,
+ Error_CompressJPEGVirtualBug = .Bits: 0x81A8B5,
+ Error_CompressJPEGWidthOverflow = .Bits: 0x81A8B6,
+ Error_CompressJPEGBadDCTCoef = .Bits: 0x81A8B7,
+ Error_CompressJPEGBadHuffTable = .Bits: 0x81A8B8,
+ Error_CompressJPEGBadProgression = .Bits: 0x81A8B9,
+ Error_CompressJPEGBadProgScript = .Bits: 0x81A8BA,
+ Error_CompressJPEGBadScanScript = .Bits: 0x81A8BB,
+ Error_CompressJPEGMismatchedQuantTable = .Bits: 0x81A8BC,
+ Error_CompressJPEGMissingData = .Bits: 0x81A8BD,
+ Error_CompressJPEGModeChange = .Bits: 0x81A8BE,
+ Error_CompressJPEGWBufferSize = .Bits: 0x81A8BF;
+
SWI
CompressJPEG_Start =
***************
*** 97,99 ****
--- 211,227 ----
( R2! -> .Data: image_data_end,
R4 = .Int: lines_written
+ ) );
+
+ SWI
+ CompressJPEG_Transcode =
+ ( NUMBER 0x4A510 "Transcodes a JPEG from one form to another - RISC O S Select",
+ ENTRY
+ ( R0 = CompressJPEG_TranscodeFlags: flags,
+ R1 -> .Data: source_data,
+ R2 = .Int: source_size,
+ R3 = .Ref .Data: destination_data,
+ R4 = .Int: destination_size,
+ R5 = .Ref .Data: workspace,
+ R6 = .Int: workspace_size,
+ R7 -> CompressJPEG_ScanDescription: scans
) )
Index: DrawFile.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib/DrawFile.swi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DrawFile.swi 13 Mar 2002 13:45:03 -0000 1.2
--- DrawFile.swi 23 Nov 2002 12:13:00 -0000 1.3
***************
*** 73,79 ****
TYPE DrawFile_RenderFlags = .Bits;
CONST
! DrawFile_RenderBBoxes = DrawFile_RenderFlags: 0b1,
! DrawFile_RenderSuppress = DrawFile_RenderFlags: 0b10,
! DrawFile_RenderGivenFlatness = DrawFile_RenderFlags: 0b100;
//Flags values for DrawFile_DeclareFonts
--- 73,80 ----
TYPE DrawFile_RenderFlags = .Bits;
CONST
! DrawFile_RenderBBoxes = DrawFile_RenderFlags: 0b1,
! DrawFile_RenderSuppress = DrawFile_RenderFlags: 0b10,
! DrawFile_RenderGivenFlatness = DrawFile_RenderFlags: 0b100,
! DrawFile_RenderGivenColourMapping = DrawFile_RenderFlags: 0b1000;
//Flags values for DrawFile_DeclareFonts
***************
*** 300,303 ****
--- 301,319 ----
);
+ SWI
+ DrawFile_RenderMapped =
+ ( NUMBER 0x45540 "RISC O S 4+",
+ ENTRY
+ ( R0 # DrawFile_RenderGivenColourMapping,
+ R0 | DrawFile_RenderFlags: flags,
+ R1 -> DrawFile_Diagram: diagram,
+ R2 = .Int: size,
+ R3 -> OS_Trfm: trfm,
+ R4 -> OS_Box: clip,
+ R5 = .Int: flatness,
+ R6 -> OSSpriteOp_ColourMapping: mapping
+ )
+ );
+
// Renders the |size| bytes of |diagram| using the given transformation
//|trfm|. A rectangle |clip| may be assed in; this allows DrawFile_Render to
***************
*** 352,356 ****
.Ref OS_Box: clip,
.Int: flatness,
! .Ref OS_Error: error
);
--- 368,373 ----
.Ref OS_Box: clip,
.Int: flatness,
! .Ref OS_Error: error,
! .Ref OSSpriteOp_ColourMapping: mapping "RISC O S 4+"
);
Index: JPEG.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib/JPEG.swi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JPEG.swi 9 Mar 2002 11:13:23 -0000 1.1
--- JPEG.swi 23 Nov 2002 12:13:00 -0000 1.2
***************
*** 2,6 ****
AUTHOR "Jonathan Coxhead, jon...@do..., 21 Aug 1995";
! NEEDS OS;
TYPE JPEG_InfoFlags = .Bits;
--- 2,6 ----
AUTHOR "Jonathan Coxhead, jon...@do..., 21 Aug 1995";
! NEEDS OS, OSSpriteOp;
TYPE JPEG_InfoFlags = .Bits;
***************
*** 13,23 ****
CONST
JPEG_ScaleDithered = JPEG_ScaleFlags: %1,
! JPEG_ScaleErrorDiffused = JPEG_ScaleFlags: %10;
TYPE JPEG_TransformFlags = .Bits;
CONST
! JPEG_DestinationCoords = JPEG_TransformFlags: %1,
! JPEG_TransformDithered = JPEG_TransformFlags: %10,
! JPEG_TransformErrorDiffused = JPEG_TransformFlags: %100;
CONST
--- 13,29 ----
CONST
JPEG_ScaleDithered = JPEG_ScaleFlags: %1,
! JPEG_ScaleErrorDiffused = JPEG_ScaleFlags: %10,
! JPEG_ScaleGivenColourMapping = JPEG_ScaleFlags: %100,
! JPEG_ScaleTranslucency = JPEG_ScaleFlags: %111111110000,
! JPEG_ScaleTranslucencyShift = .Int: 4;
TYPE JPEG_TransformFlags = .Bits;
CONST
! JPEG_DestinationCoords = JPEG_TransformFlags: %1,
! JPEG_TransformDithered = JPEG_TransformFlags: %10,
! JPEG_TransformErrorDiffused = JPEG_TransformFlags: %100,
! JPEG_TransformGivenColourMapping = JPEG_TransformFlags: %1000,
! JPEG_TransformTranslucency = JPEG_TransformFlags: %1111111100000,
! JPEG_TransformTranslucencyShift = .Int: 5;
CONST
***************
*** 74,77 ****
--- 80,96 ----
) );
+ SWI JPEG_PlotScaledMapped =
+ ( NUMBER 0x49982 "Plots a JPEG image from memory with colour mapping - RISC O S 4+",
+ ENTRY
+ ( R0 -> JPEG_Image: image,
+ R1 = .Int: x,
+ R2 = .Int: y,
+ R3 -> OS_Factors: factors,
+ R4 = .Int: size,
+ R5 # JPEG_ScaleGivenColourMapping,
+ R5 | JPEG_ScaleFlags: flags,
+ R6 -> OSSpriteOp_ColourMapping: mapping
+ ) );
+
SWI JPEG_PlotFileScaled =
( NUMBER 0x49983 "Plots a JPEG image from a file - RISC O S 3.6+",
***************
*** 84,87 ****
--- 103,118 ----
) );
+ SWI JPEG_PlotFileScaledMapped =
+ ( NUMBER 0x49983 "Plots a JPEG image from a file with colour mapping - RISC O S 4+",
+ ENTRY
+ ( R0 -> .String: file_name,
+ R1 = .Int: x,
+ R2 = .Int: y,
+ R3 -> OS_Factors: factors,
+ R4 # JPEG_ScaleGivenColourMapping,
+ R4 | JPEG_ScaleFlags: flags,
+ R5 -> OSSpriteOp_ColourMapping: mapping
+ ) );
+
SWI JPEG_PlotTransformed =
( NUMBER 0x49984 "Plots a JPEG image from memory using a transformation matrix - RISC O S 3.6+",
***************
*** 93,96 ****
--- 124,138 ----
) );
+ SWI JPEG_PlotTransformedMapped =
+ ( NUMBER 0x49984 "Plots a JPEG image from memory using a transformation matrix with colour mapping - RISC O S 4+",
+ ENTRY
+ ( R0 -> JPEG_Image: image,
+ R1 # JPEG_TransformGivenColourMapping,
+ R1 | JPEG_TransformFlags: flags,
+ R2 -> OS_Trfm: trfm_or_rect,
+ R3 = .Int: size,
+ R4 -> OSSpriteOp_ColourMapping: mapping
+ ) );
+
SWI JPEG_PlotFileTransformed =
( NUMBER 0x49985 "Plots a JPEG image from a file using a transformation matrix - RISC O S 3.6+",
***************
*** 99,102 ****
--- 141,154 ----
R1 = JPEG_TransformFlags: flags,
R2 -> OS_Trfm: trfm_or_rect
+ ) );
+
+ SWI JPEG_PlotFileTransformedMapped =
+ ( NUMBER 0x49985 "Plots a JPEG image from a file using a transformation matrix with colour mapping - RISC O S 4+",
+ ENTRY
+ ( R0 -> .String: file_name,
+ R1 # JPEG_TransformGivenColourMapping,
+ R1 | JPEG_TransformFlags: flags,
+ R2 -> OS_Trfm: trfm_or_rect,
+ R3 -> OSSpriteOp_ColourMapping: mapping
) );
|
|
From: <th...@us...> - 2002-11-23 12:13:03
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv11194/Source/Core/oslib
Modified Files:
OS.swi OSSpriteOp.swi
Added Files:
BlendTable.swi InverseTable.swi
Log Message:
Various updates to graphics related calls to reflect changes made
in Select, including the addition of BlendTable, InverseTable, ConverPNG
and ImageRender and the addition of CMYK sprite support.
--- NEW FILE: BlendTable.swi ---
TITLE BlendTable;
AUTHOR "Tom Hughes, to...@co..., 20 Nov 2002";
NEEDS OS, OSSpriteOp;
TYPE
BlendTable_GenerateFlags = .Bits;
CONST
BlendTable_SourceIsPointer = BlendTable_GenerateFlags: 0b1,
BlendTable_DestinaionIsPointer = BlendTable_GenerateFlags: 0b10,
BlendTable_LockTable = BlendTable_GenerateFlags: 0b100;
SWI
BlendTable_GenerateTableModeToMode =
( NUMBER 0x56280 "Generate a table of blended palette entries for blending
between two modes - RISC O S 4.31+",
ENTRY
( R0 = BlendTable_GenerateFlags: flags,
R1 = OS_Mode: source_mode,
R2 # 0,
R3 = OS_Mode: destination_mode,
R4 # 0,
R5 = .Int: translucency,
R6 = .Ref .Data: buffer_in
),
EXIT
( R0 = .Int: source_colours,
R1 = .Int: destination_colours,
R2 = .Int: size,
R6 = .Ref .Data: buffer_out
) ),
BlendTable_GenerateTableModeToSprite =
( NUMBER 0x56280 "Generate a table of blended palette entries for blending
from a mode to a sprite - RISC O S 4.31+",
ENTRY
( R0 = BlendTable_GenerateFlags: flags,
R1 = OS_Mode: source_mode,
R2 # 0,
R3 -> OSSpriteOp_Area: destination_area,
R4 = OSSpriteOp_Id: destination_id,
R5 = .Int: translucency,
R6 = .Ref .Data: buffer_in
),
EXIT
( R0 = .Int: source_colours,
R1 = .Int: destination_colours,
R2 = .Int: size,
R6 = .Ref .Data: buffer_out
) ),
BlendTable_GenerateTableSpriteToMode =
( NUMBER 0x56280 "Generate a table of blended palette entries for blending
from a sprite to a mode - RISC O S 4.31+",
ENTRY
( R0 = BlendTable_GenerateFlags: flags,
R1 -> OSSpriteOp_Area: source_area,
R2 = OSSpriteOp_Id: source_id,
R3 = OS_Mode: destination_mode,
R4 # 0,
R5 = .Int: translucency,
R6 = .Ref .Data: buffer_in
),
EXIT
( R0 = .Int: source_colours,
R1 = .Int: destination_colours,
R2 = .Int: size,
R6 = .Ref .Data: buffer_out
) ),
BlendTable_GenerateTableSpriteToSprite =
( NUMBER 0x56280 "Generate a table of blended palette entries for blending
between two sprites - RISC O S 4.31+",
ENTRY
( R0 = BlendTable_GenerateFlags: flags,
R1 -> OSSpriteOp_Area: source_area,
R2 = OSSpriteOp_Id: source_id,
R3 -> OSSpriteOp_Area: destination_area,
R4 = OSSpriteOp_Id: destination_id,
R5 = .Int: translucency,
R6 = .Ref .Data: buffer_in
),
EXIT
( R0 = .Int: source_colours,
R1 = .Int: destination_colours,
R2 = .Int: size,
R6 = .Ref .Data: buffer_out
) ),
BlendTable_UnlockTable =
( NUMBER 0x56281 "Unlock a blend table - RISC O S 4.31+",
ENTRY
( R0 = .Ref .Data: buffer
) )
--- NEW FILE: InverseTable.swi ---
TITLE InverseTable;
AUTHOR "Tom Hughes, to...@co..., 21 Nov 2002";
NEEDS OS, OSSpriteOp;
TYPE
InverseTable_Colour = .Bits;
CONST
InverseTable_RShift = .Int: 0,
InverseTable_GShift = .Int: 5,
InverseTable_BShift = .Int: 10,
InverseTable_R = InverseTable_Colour: 0b11111,
InverseTable_G = InverseTable_Colour: 0b1111100000,
InverseTable_B = InverseTable_Colour: 0b111110000000000;
SWI
InverseTable_CalculateTable =
( NUMBER 0x4BF40 "Calculates inverse tables for the current destination - RISC O S 4.32+",
EXIT
( R0 = .Ref InverseTable_Colour: gcol_to_colour,
R1 = .Ref OS_GCOL: colour_to_gcol
) ),
InverseTable_SpriteTableForSprite =
( NUMBER 0x4BF41 "Calculates inverse tables for the given sprite - RISC O S 4.32+",
ENTRY
( R0 = .Ref InverseTable_Colour: gcol_to_colour_in,
R1 = .Ref OS_GCOL: colour_to_gcol_in,
R2 = OSSpriteOp_Area: area,
R3 = OSSpriteOp_Id: id
),
EXIT
( R0 = .Ref InverseTable_Colour: gcol_to_colour_out,
R1 = .Ref OS_GCOL: colour_to_gcol_out
) ),
InverseTable_SpriteTableForMode =
( NUMBER 0x4BF41 "Calculates inverse tables for the given mode - RISC O S 4.32+",
ENTRY
( R0 = .Ref InverseTable_Colour: gcol_to_colour_in,
R1 = .Ref OS_GCOL: colour_to_gcol_in,
R2 = OS_Mode: mode,
R3 # 0
),
EXIT
( R0 = .Ref InverseTable_Colour: gcol_to_colour_out,
R1 = .Ref OS_GCOL: colour_to_gcol_out
) )
Index: OS.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib/OS.swi,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OS.swi 20 Nov 2002 19:07:50 -0000 1.6
--- OS.swi 23 Nov 2002 12:12:59 -0000 1.7
***************
*** 237,248 ****
TYPE OS_ModeFlags = .Bits;
CONST
! OS_ModeFlagNonGraphics = OS_ModeFlags: %1,
! OS_ModeFlagTeletext = OS_ModeFlags: %10,
! OS_ModeFlagGap = OS_ModeFlags: %100,
! OS_ModeFlagBBCGap = OS_ModeFlags: %1000,
! OS_ModeFlagHiResMono = OS_ModeFlags: %10000,
! OS_ModeFlagDoubleHeight = OS_ModeFlags: %100000,
! OS_ModeFlagHardwareScroll = OS_ModeFlags: %1000000,
! OS_ModeFlagFullPalette = OS_ModeFlags: %10000000;
TYPE OS_VDUVar = OS_ModeVar;
--- 237,252 ----
TYPE OS_ModeFlags = .Bits;
CONST
! OS_ModeFlagNonGraphics = OS_ModeFlags: %1,
! OS_ModeFlagTeletext = OS_ModeFlags: %10,
! OS_ModeFlagGap = OS_ModeFlags: %100,
! OS_ModeFlagBBCGap = OS_ModeFlags: %1000,
! OS_ModeFlagHiResMono = OS_ModeFlags: %10000,
! OS_ModeFlagDoubleHeight = OS_ModeFlags: %100000,
! OS_ModeFlagHardwareScroll = OS_ModeFlags: %1000000,
! OS_ModeFlagFullPalette = OS_ModeFlags: %10000000,
! OS_ModeFlagDataFormat = OS_ModeFlags: %1111000000000000 "RISC O S 4.32+",
! OS_ModeFlagDataFormatShift = .Int: 12 "RISC O S 4.32+",
! OS_ModeFlagDataFormatRGB = OS_ModeFlags: 0 "RISC O S 4.32+",
! OS_ModeFlagDataFormatCMYK = OS_ModeFlags: 1 "RISC O S 4.32+";
TYPE OS_VDUVar = OS_ModeVar;
Index: OSSpriteOp.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib/OSSpriteOp.swi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSSpriteOp.swi 28 Aug 2002 13:53:22 -0000 1.2
--- OSSpriteOp.swi 23 Nov 2002 12:12:59 -0000 1.3
***************
*** 10,13 ****
--- 10,19 ----
OSSpriteOp_TransTab = .Struct (.Byte: c ...),
+ OSSpriteOp_ColourMapping =
+ .Struct
+ ( .Ref .Data: workspace,
+ .Ref .Asm: function
+ ),
+
OSSpriteOp_Area =
.Struct
***************
*** 95,107 ****
Error_SpriteOpBadTransformation = .Bits: &715,
Error_SpriteOpBadDepth = .Bits: &716,
! Error_SpriteOpBadSwitchDepth = .Bits: &717;
TYPE OSSpriteOp_Action = OS_Action;
CONST
//for PutSpriteScaled, PutSpriteTrfm (R5)
! OSSpriteOp_UseMask = OSSpriteOp_Action: 0b1000,
! OSSpriteOp_UsePalette = OSSpriteOp_Action: 0b10000 "RISC OS 3.5+",
! OSSpriteOp_GivenWideEntries = OSSpriteOp_Action: 0b100000 "RISC OS 3.6+",
! OSSpriteOp_Dithered = OSSpriteOp_Action: 0b1000000 "RISC OS 3.6+";
SWI OS_SpriteOp = (NUMBER 0x2E "Controls the sprite system -
--- 101,120 ----
Error_SpriteOpBadTransformation = .Bits: &715,
Error_SpriteOpBadDepth = .Bits: &716,
! Error_SpriteOpBadSwitchDepth = .Bits: &717,
! Error_SpriteOpBadColourMap = .Bits: &720,
! Error_SpriteOpBadJPEGUnsupported = .Bits: &721,
! Error_SpriteOpBadJPEGProgressive = .Bits: &722,
! Error_SpriteOpBadType = .Bits: &723;
TYPE OSSpriteOp_Action = OS_Action;
CONST
//for PutSpriteScaled, PutSpriteTrfm (R5)
! OSSpriteOp_UseMask = OSSpriteOp_Action: 0x8,
! OSSpriteOp_UsePalette = OSSpriteOp_Action: 0x10 "RISC O S 3.5+",
! OSSpriteOp_GivenWideEntries = OSSpriteOp_Action: 0x20 "RISC O S 3.6+",
! OSSpriteOp_Dithered = OSSpriteOp_Action: 0x40 "RISC O S 3.6+",
! OSSpriteOp_GivenColourMapping = OSSpriteOp_Action: 0x80 "RISC O S 4+",
! OSSpriteOp_Translucency = OSSpriteOp_Action: 0xff00 "RISC O S 4+",
! OSSpriteOp_TranslucencyShift = .Int: 8 "RISC O S 4+";
SWI OS_SpriteOp = (NUMBER 0x2E "Controls the sprite system -
***************
*** 579,584 ****
) ),
! OSSpriteOp_PutSpriteGreyScaled = (NUMBER 0x2E, ENTRY (R0 # 53 "Puts
! sprite scaled and anti-aliased - not RISC O S 3.5+",
R0 | OSSpriteOp_Flags: flags,
R1 -> OSSpriteOp_Area: area,
--- 592,614 ----
) ),
! OSSpriteOp_PutSpriteScaledMapped =
! ( NUMBER 0x2E,
! ENTRY
! ( R0 # 52 "Puts sprite scaled with colour mapping - RISC O S 4+",
! R0 | OSSpriteOp_Flags: flags,
! R1 -> OSSpriteOp_Area: area,
! R2 = OSSpriteOp_Id: id,
! R3 = .Int: x,
! R4 = .Int: y,
! R5 # OSSpriteOp_GivenColourMapping,
! R5 | OSSpriteOp_Action: action,
! R6 -> OS_Factors: factors,
! R7 -> OSSpriteOp_ColourMapping: mapping
! ) ),
!
! OSSpriteOp_PutSpriteGreyScaled =
! ( NUMBER 0x2E,
! ENTRY
! ( R0 # 53 "Puts sprite scaled and anti-aliased - not RISC O S 3.5+",
R0 | OSSpriteOp_Flags: flags,
R1 -> OSSpriteOp_Area: area,
***************
*** 588,592 ****
R5 # 0,
R6 -> OS_Factors: factors,
! R7 -> OSSpriteOp_TransTab: trans_tab)),
OSSpriteOp_RemoveLeftHandWastage =
--- 618,623 ----
R5 # 0,
R6 -> OS_Factors: factors,
! R7 -> OSSpriteOp_TransTab: trans_tab
! ) ),
OSSpriteOp_RemoveLeftHandWastage =
***************
*** 629,632 ****
--- 660,678 ----
R6 -> OS_Trfm: trfm,
R7 -> OSSpriteOp_TransTab: trans_tab
+ ) ),
+
+ OSSpriteOp_PutSpriteTrfmMapped =
+ ( NUMBER 0x2E,
+ ENTRY
+ ( R0 # 56 "Puts sprite transformed with colour mapping - RISC O S 4+",
+ R0 | OSSpriteOp_Flags: flags,
+ R1 -> OSSpriteOp_Area: area,
+ R2 = OSSpriteOp_Id: id,
+ R3 = OSSpriteOp_TrfmFlags: trfm_flags,
+ R4 -> OS_Box: source_rect,
+ R5 # OSSpriteOp_GivenColourMapping,
+ R5 | OSSpriteOp_Action: action,
+ R6 -> OS_Trfm: trfm,
+ R7 -> OSSpriteOp_ColourMapping: mapping
) ),
|
|
From: <th...@us...> - 2002-11-20 19:41:02
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv12566/Source/User/oslib
Modified Files:
Wimp.swi
Log Message:
Added WimpTextOp_StringWidthWithFlags.
Index: Wimp.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib/Wimp.swi,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Wimp.swi 20 Nov 2002 19:09:11 -0000 1.8
--- Wimp.swi 20 Nov 2002 19:40:58 -0000 1.9
***************
*** 2086,2089 ****
--- 2086,2093 ----
);
+ TYPE WimpTextOp_StringWidthFlags = .Bits;
+ CONST
+ WimpTextOp_SizeCovered = WimpTextOp_StringWidthFlags: &80000000 "RISC O S 4.32+";
+
TYPE WimpTextOp_PaintFlags = .Bits;
CONST
***************
*** 2091,2106 ****
WimpTextOp_RJustify = WimpTextOp_PaintFlags: &80000000;
! SWI Wimp_TextOp = (NUMBER 0x400f9 "Manipulates and displays text using the
! current desktop font -
! see individual reason codes", ABSENT),
! WimpTextOp_SetColour = (NUMBER 0x400f9, ENTRY (R0 # 0 "Sets the colour to
! use for text plotting with WimpTextOp_Paint", R1 = OS_Colour: fg,
! R2 = OS_Colour: bg), EXIT (R0?)),
! WimpTextOp_StringWidth = (NUMBER 0x400f9, ENTRY (R0 # 1 "Gets the width of
! a string for the current desktop font", R1 -> .String: s,
! R2 = .Int: len), EXIT (R0! = .Int: width)),
! WimpTextOp_Paint = (NUMBER 0x400f9, ENTRY (R0 # 2 "Plots text on the
! screen using the current desktop font", R0 | WimpTextOp_PaintFlags: flags,
! R1 -> .String: s, R2 # -1, R3 # -1, R4 = .Int: x0, R5 = .Int: y0));
SWI Wimp_SetWatchdogState = (NUMBER 0x400fa "Sets the state of the Wimp's watchdog",
--- 2095,2150 ----
WimpTextOp_RJustify = WimpTextOp_PaintFlags: &80000000;
! SWI
! Wimp_TextOp =
! ( NUMBER 0x400f9 "Manipulates and displays text using the current
! desktop font - see individual reason codes",
! ABSENT
! ),
!
! WimpTextOp_SetColour =
! ( NUMBER 0x400f9,
! ENTRY
! ( R0 # 0 "Sets the colour to use for text plotting with WimpTextOp_Paint",
! R1 = OS_Colour: fg,
! R2 = OS_Colour: bg
! ),
! EXIT
! ( R0?
! ) ),
!
! WimpTextOp_StringWidth =
! ( NUMBER 0x400f9,
! ENTRY
! ( R0 # 1 "Gets the width of a string for the current desktop font",
! R1 -> .String: s,
! R2 = .Int: len
! ),
! EXIT
! ( R0! = .Int: width
! ) ),
!
! WimpTextOp_StringWidthWithFlags =
! ( NUMBER 0x400f9,
! ENTRY
! ( R0 # 1 "Gets the width of a string for the current desktop font",
! R0 | WimpTextOp_StringWidthFlags: flags,
! R1 -> .String: s,
! R2 = .Int: len
! ),
! EXIT
! ( R0! = .Int: width
! ) ),
!
! WimpTextOp_Paint =
! ( NUMBER 0x400f9,
! ENTRY
! ( R0 # 2 "Plots text on the screen using the current desktop font",
! R0 | WimpTextOp_PaintFlags: flags,
! R1 -> .String: s,
! R2 # -1,
! R3 # -1,
! R4 = .Int: x0,
! R5 = .Int: y0
! ) );
SWI Wimp_SetWatchdogState = (NUMBER 0x400fa "Sets the state of the Wimp's watchdog",
|
|
From: <th...@us...> - 2002-11-20 19:41:02
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv12566/docs
Modified Files:
ChangeLog
Log Message:
Added WimpTextOp_StringWidthWithFlags.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/docs/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ChangeLog 20 Nov 2002 19:33:51 -0000 1.13
--- ChangeLog 20 Nov 2002 19:40:59 -0000 1.14
***************
*** 23,26 ****
--- 23,27 ----
- Added Socket_FIOPOLLWORD ioctl. (Tom Hughes)
- Added Reboot and PowerOff flags for TaskManager_Shutdown. (Tom Hughes)
+ - Added WimpTextOp_StringWidthWithFlags. (Tom Hughes)
* Bug Fixes:
|
|
From: <th...@us...> - 2002-11-20 19:33:54
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv9697/docs
Modified Files:
ChangeLog
Log Message:
Added Reboot and PowerOff flags for TaskManager_Shutdown.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/docs/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ChangeLog 20 Nov 2002 19:28:31 -0000 1.12
--- ChangeLog 20 Nov 2002 19:33:51 -0000 1.13
***************
*** 22,25 ****
--- 22,26 ----
- Added context manipulation SWIs to FPEmulator. (Tom Hughes)
- Added Socket_FIOPOLLWORD ioctl. (Tom Hughes)
+ - Added Reboot and PowerOff flags for TaskManager_Shutdown. (Tom Hughes)
* Bug Fixes:
|
|
From: <th...@us...> - 2002-11-20 19:33:54
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv9697/Source/User/oslib
Modified Files:
TaskManager.swi
Log Message:
Added Reboot and PowerOff flags for TaskManager_Shutdown.
Index: TaskManager.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib/TaskManager.swi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TaskManager.swi 9 Mar 2002 11:14:12 -0000 1.1
--- TaskManager.swi 20 Nov 2002 19:33:51 -0000 1.2
***************
*** 49,53 ****
TaskManager_ShutdownPortablePowerDown = TaskManager_ShutdownFlags: %100,
TaskManager_ShutdownSendMessage = TaskManager_ShutdownFlags: %1000,
! TaskManager_ShutdownIgnoreUpCalls = TaskManager_ShutdownFlags: %10000;
SWI
--- 49,55 ----
TaskManager_ShutdownPortablePowerDown = TaskManager_ShutdownFlags: %100,
TaskManager_ShutdownSendMessage = TaskManager_ShutdownFlags: %1000,
! TaskManager_ShutdownIgnoreUpCalls = TaskManager_ShutdownFlags: %10000,
! TaskManager_ShutdownReboot = TaskManager_ShutdownFlags: %100000 "RISC O S 4+",
! TaskManager_ShutdownPowerOff = TaskManager_ShutdownFlags: %1000000 "RISC O S 4+";
SWI
|
|
From: <th...@us...> - 2002-11-20 19:28:34
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv7698/docs
Modified Files:
ChangeLog
Log Message:
Added Socket_FIOPOLLWORD ioctl for RISC O S Select.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/docs/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ChangeLog 20 Nov 2002 19:19:26 -0000 1.11
--- ChangeLog 20 Nov 2002 19:28:31 -0000 1.12
***************
*** 21,24 ****
--- 21,25 ----
- Added interfaces for wheel mouse support. (Tom Hughes)
- Added context manipulation SWIs to FPEmulator. (Tom Hughes)
+ - Added Socket_FIOPOLLWORD ioctl. (Tom Hughes)
* Bug Fixes:
|
|
From: <th...@us...> - 2002-11-20 19:28:33
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Computer/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv7698/Source/Computer/oslib
Modified Files:
Socket.swi
Log Message:
Added Socket_FIOPOLLWORD ioctl for RISC O S Select.
Index: Socket.swi
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Computer/oslib/Socket.swi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Socket.swi 17 Aug 2002 07:41:15 -0000 1.2
--- Socket.swi 20 Nov 2002 19:28:30 -0000 1.3
***************
*** 134,137 ****
--- 134,143 ----
);
+ TYPE Socket_Pwstruct =
+ .Struct
+ ( .Ref .Bits: pollword,
+ .Int: bit_number
+ );
+
// 4 = OUT
// 8 = IN
***************
*** 165,169 ****
Socket_FIONREAD = Socket_IoctlNo: 0x4004667F "get number of bytes to read (Int)",
Socket_FIONBIO = Socket_IoctlNo: 0x8004667E "set/clear non-blocking i/o (Int)",
! Socket_FIOASYNC = Socket_IoctlNo: 0x8004667D "set/clear async i/o (Int)";
TYPE Socket_MsgFlags = .Bits;
--- 171,176 ----
Socket_FIONREAD = Socket_IoctlNo: 0x4004667F "get number of bytes to read (Int)",
Socket_FIONBIO = Socket_IoctlNo: 0x8004667E "set/clear non-blocking i/o (Int)",
! Socket_FIOASYNC = Socket_IoctlNo: 0x8004667D "set/clear async i/o (Int)",
! Socket_FIOPOLLWORD = Socket_IoctlNo: 0x80086678 "set/clear pollword (Socket_Pwstruct) - RISC O S 4.32+";
TYPE Socket_MsgFlags = .Bits;
|
|
From: <th...@us...> - 2002-11-20 19:19:29
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv3987/docs
Modified Files:
ChangeLog
Log Message:
Added context manipulation SWIs for FPEmulator. These are available in
version 4.12 and later of FPEmulator and are detailed with the 32 bit
development tools from Castle.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/docs/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ChangeLog 20 Nov 2002 19:07:49 -0000 1.10
--- ChangeLog 20 Nov 2002 19:19:26 -0000 1.11
***************
*** 20,23 ****
--- 20,24 ----
- Added OSReadSysInfo_ROMInformation. (Tom Hughes)
- Added interfaces for wheel mouse support. (Tom Hughes)
+ - Added context manipulation SWIs to FPEmulator. (Tom Hughes)
* Bug Fixes:
|
|
From: <th...@us...> - 2002-11-20 19:19:28
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib In directory sc8-pr-cvs1:/tmp/cvs-serv3987/Source/Core/oslib Modified Files: FPEmulator.swi Log Message: Added context manipulation SWIs for FPEmulator. These are available in version 4.12 and later of FPEmulator and are detailed with the 32 bit development tools from Castle. Index: FPEmulator.swi =================================================================== RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/Core/oslib/FPEmulator.swi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FPEmulator.swi 9 Mar 2002 10:58:03 -0000 1.1 --- FPEmulator.swi 20 Nov 2002 19:19:25 -0000 1.2 *************** *** 1,10 **** TITLE FPEmulator; AUTHOR "Jonathan Coxhead, jon...@do..., 29 Apr 1994"; NEEDS OS; ! SWI FPEmulator_Version = ! ( NUMBER 0x40480 "Returns the version number of the Floating Point ! Emulator", ! EXIT (R0! = .Int: version) ! ) --- 1,102 ---- TITLE FPEmulator; + AUTHOR "Jonathan Coxhead, jon...@do..., 29 Apr 1994"; NEEDS OS; ! TYPE ! FPEmulator_Context; ! ! CONST ! FPEmulator_NoContext = FPEmulator_Context: 0 "FPEmulator 4.12+", ! FPEmulator_DefaultContext = FPEmulator_Context: -1 "FPEmulator 4.12+", ! FPEmulator_CurrentContext = FPEmulator_Context: -2 "FPEmulator 4.12+"; ! ! TYPE ! FPEmulator_RegisterDump = ! .Struct ! ( .Bits: fpsr, ! [12] .Byte: f0, ! [12] .Byte: f1, ! [12] .Byte: f2, ! [12] .Byte: f3, ! [12] .Byte: f4, ! [12] .Byte: f5, ! [12] .Byte: f6, ! [12] .Byte: f7 ! ); ! ! SWI ! FPEmulator_Version = ! ( NUMBER 0x40480 "Returns the version number of the Floating Point Emulator", ! EXIT ! ( R0! = .Int: version ! ) ), ! ! FPEmulator_DeactivateContext = ! ( NUMBER 0x40481 "Deactivates the the current floating point context - FPEmulator 4.12+", ! EXIT ! ( R0! = FPEmulator_Context: old_context ! ) ), ! ! FPEmulator_ActivateContext = ! ( NUMBER 0x40482 "Activates a floating point context - FPEmulator 4.12+", ! ENTRY ! ( R0 = FPEmulator_Context: new_context ! ) ), ! ! FPEmulator_ChangedContext = ! ( NUMBER 0x40483 "Change the currrent floating point context - FPEmulator 4.12+", ! ENTRY ! ( R0 = FPEmulator_Context: new_context ! ), ! EXIT ! ( R0! = FPEmulator_Context: old_context ! ) ), ! ! FPEmulator_ContextLength = ! ( NUMBER 0x40484 "Returns the size of a floating point context - FPEmulator 4.12+", ! EXIT ! ( R0! = .Int: context_length ! ) ), ! ! FPEmulator_InitContext = ! ( NUMBER 0x40485 "Initialises a floating point context - FPEmulator 4.12+", ! ENTRY ! ( R0 = FPEmulator_Context: context ! ) ), ! ! FPEmulator_ExceptionDump = ! ( NUMBER 0x40486 "Returns the address of the floating point register dump - FPEmulator 4.12+", ! EXIT ! ( R0! = .Ref FPEmulator_RegisterDump: register_dump ! ) ), ! ! FPEmulator_Abort = ! ( NUMBER 0x40487 "Aborts any incomplete floating point processing - FPEmulator 4.12+", ! ENTRY ! ( R0 = FPEmulator_Context: context, ! R1 = .Int: r12_value, ! R2 = .Int: pc_value ! ), ! EXIT ! ( R0! = .Ref .Data: frame ! ) ), ! ! FPEmulator_LoadContext = ! ( NUMBER 0x40488 "Loads a floating point context - FPEmulator 4.12+", ! ENTRY ! ( R0 = FPEmulator_Context: context, ! R1 -> FPEmulator_RegisterDump: register_dump ! ) ), ! ! FPEmulator_SaveContext = ! ( NUMBER 0x40489 "Saves the contents of a floating point context - FPEmulator 4.12+", ! ENTRY ! ( R0 = FPEmulator_Context: context, ! R1 = .Ref FPEmulator_RegisterDump: register_dump, ! R2 = .Int: pc_value ! ), ! EXIT ! ( R0! = .Bool: has_exception ! ) ) |
10 messages has been excluded from this view by a project administrator.
