Skip to content

GitLab

"dev/usb/git@gitlab.riscosopen.org:cgranville/USBDriver.git" did not exist on "68f485b5e6d3a0427f5e6025b9843a057430cfed"
Source
...
Target
Commits (2)
  • Robert Sprowson's avatar
    Makefile recreated from fragments · 0376c3c9
    Robert Sprowson authored 
    Include paths changed to Unix style.
Debug and non debug CMHG definitions replaced by one which is selected by passing predefines to CMHG.
Removed dummy services.h.
Don't bother calling TinyStubs SWI since in ROM it does nothing, and the RAM versions haven't used it since ~1997.
Use module header constants generated from CMHG rather than hand made one.
Reject out of range SWIs (fixes ticket #305).

Version 0.22. Tagged as 'ColourMenu-0_22'
    0376c3c9
  • Robert Sprowson's avatar
    Suppress log chatter · 46472567
    Robert Sprowson authored 
    No headers to export (they're in tboxlibs), state this explicitly.
Retagged.
    46472567
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 184 deletions
!MkClean,fd7
View file @ 46472567
......@@ -13,5 +13,5 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine clean COMPONENT=ColourMenu
stripdepnd Makefile
amu_machine clean
stripdepnd
!MkTrace,fd7 → !MkDebug,fd7
View file @ 46472567
| Copyright 2000 Pace Micro Technology plc
| Copyright 2015 Castle Technology Ltd
|
| Licensed under the Apache License, Version 2.0 (the "License");
| you may not use this file except in compliance with the License.
......@@ -13,4 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine trace COMPONENT=ColourMenu
amu_machine debug THROWBACK=-throwback
!MkRam,fd7
View file @ 46472567
......@@ -13,4 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine all COMPONENT=ColourMenu
amu_machine standalone
!MkRom,fd7
View file @ 46472567
......@@ -13,4 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine rom COMPONENT=ColourMenu
amu_machine rom
Makefile
View file @ 46472567
......@@ -12,37 +12,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Makefile for a Toolbox Object module
# Makefile for ColourMenu module
#
# $Id$
#
# Component specific options:
#
RAMMESSAGES = o.msgs
COMMON_OBJ = o.Modhdr_NoD o.auxiliary o.create o.delete o.events o.getstate\
o.hide o.miscop o.show o.task
ROM_OBJS = o.mainROM ${COMMON_OBJ}
RAM_OBJS = o.main ${RAMMESSAGES} ${COMMON_OBJ}
DBG_OBJS = od.main ${RAMMESSAGES} o.Modhdr od.auxiliary od.create od.delete od.events od.getstate\
od.hide od.miscop od.show od.task
#
# Get main rules
#
include C:tboxlibint.TboxMake
#
# Module specific rules:
#
resources: resources-messages
@echo ${COMPONENT}: resource files copied to Messages module
COMPONENT = ColourMenu
OBJS = auxiliary create delete events getstate\
hide main miscop show task
CMHGDEPENDS = main
ROMCDEFINES = -DROM
CDFLAGS = -Ddebugging=1
CMHGDFLAGS = -Ddebugging=1
CINCLUDES = -IC:tboxlibint,tbox:,C:
HDRS =
LIBS = ${TBOXINTLIB}
DBG_LIBS = ${TBOXINTDBGLIB}
clean: toolbox-clean
@echo ${COMPONENT}: cleaned
include CModule
#---------------------------------------------------------------------------
# Dynamic dependencies:
VersionNum
View file @ 46472567
/* (0.21)
/* (0.22)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.21
#define Module_MajorVersion_CMHG 0.22
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 04 May 2000
#define Module_Date_CMHG 18 Aug 2015
#define Module_MajorVersion "0.21"
#define Module_Version 21
#define Module_MajorVersion "0.22"
#define Module_Version 22
#define Module_MinorVersion ""
#define Module_Date "04 May 2000"
#define Module_Date "18 Aug 2015"
#define Module_FullVersion "0.21"
#define Module_ApplicationDate "18-Aug-15"
#define Module_ComponentName "ColourMenu"
#define Module_ComponentPath "castle/RiscOS/Sources/Toolbox/ColourMenu"
#define Module_FullVersion "0.22"
#define Module_HelpVersion "0.22 (18 Aug 2015)"
#define Module_LibraryVersionInfo "0:22"
c/auxiliary
View file @ 46472567
......@@ -29,18 +29,16 @@
#include "const.h"
#include "macros.h"
#include "services.h"
#include "debug.h"
#include "mem.h"
#include "twimp.h"
#include "style.h"
#include "string32.h"
#include "messages.h"
#include "objects.toolbox.h"
#include "objects.colourmenu.h"
#include "objects.menu.h"
#include "objects/toolbox.h"
#include "objects/colourmenu.h"
#include "objects/menu.h"
#include "main.h"
#include "auxiliary.h"
#include "object.h"
#include "task.h"
......
c/create
View file @ 46472567
......@@ -28,13 +28,12 @@
#include "const.h"
#include "macros.h"
#include "services.h"
#include "debug.h"
#include "mem.h"
#include "string32.h"
#include "messages.h"
#include "objects.toolbox.h"
#include "objects.colourmenu.h"
#include "objects/toolbox.h"
#include "objects/colourmenu.h"
#include "object.h"
#include "auxiliary.h"
......
c/delete
View file @ 46472567
......@@ -27,13 +27,12 @@
#include "const.h"
#include "macros.h"
#include "services.h"
#include "debug.h"
#include "mem.h"
#include "string32.h"
#include "messages.h"
#include "objects.toolbox.h"
#include "objects.colourmenu.h"
#include "objects/toolbox.h"
#include "objects/colourmenu.h"
#include "object.h"
#include "auxiliary.h"
......
c/events
View file @ 46472567
......@@ -29,13 +29,12 @@
#include "const.h"
#include "macros.h"
#include "services.h"
#include "debug.h"
#include "mem.h"
#include "string32.h"
#include "messages.h"
#include "objects.toolbox.h"
#include "objects.colourmenu.h"
#include "objects/toolbox.h"
#include "objects/colourmenu.h"
#include "object.h"
......
c/getstate
View file @ 46472567
......@@ -27,13 +27,12 @@
#include "const.h"
#include "macros.h"
#include "services.h"
#include "debug.h"
#include "mem.h"
#include "messages.h"
#include "objects.toolbox.h"
#include "objects.colourmenu.h"
#include "objects/toolbox.h"
#include "objects/colourmenu.h"
#include "object.h"
#include "auxiliary.h"
......
c/hide
View file @ 46472567
......@@ -27,13 +27,12 @@
#include "const.h"
#include "macros.h"
#include "services.h"
#include "debug.h"
#include "mem.h"
#include "string32.h"
#include "messages.h"
#include "objects.toolbox.h"
#include "objects.colourmenu.h"
#include "objects/toolbox.h"
#include "objects/colourmenu.h"
#include "object.h"
#include "auxiliary.h"
......
c/main
View file @ 46472567
......@@ -24,10 +24,10 @@
#include <stdlib.h>
#include "kernel.h"
#include "swis.h"
#include "Global/Services.h"
#include "const.h"
#include "macros.h"
#include "services.h"
#include "debug.h"
#include "rmensure.h"
#include "mem.h"
......@@ -35,8 +35,8 @@
#include "string32.h"
#include "messages.h"
#include "objmodule.h"
#include "objects.toolbox.h"
#include "objects.colourmenu.h"
#include "objects/toolbox.h"
#include "objects/colourmenu.h"
#include "object.h"
#include "auxiliary.h"
......@@ -50,7 +50,7 @@
#include "task.h"
#include "main.h"
#include "ColourMenuHdr.h"
#define MAX_CLASS_SWI_METHODS 7
......@@ -68,10 +68,8 @@ static _kernel_oserror *(*class_swi_methods [MAX_CLASS_SWI_METHODS])(_kernel_swi
/* +++++++++++++++++++++++++++++++++ finalisation code +++++++++++++++++++++++++++++++++ */
#ifdef ROM
static _kernel_oserror *__ROM;
#else
extern int messages_file(void);
#ifndef ROM
extern int Resources(void);
#endif
extern _kernel_oserror *ColourMenu_finalise (int fatal, int podule, void *pw)
......@@ -101,7 +99,7 @@ extern _kernel_oserror *ColourMenu_finalise (int fatal, int podule, void *pw)
* ... and deregister from ResourceFS
*/
objmodule_deregister_resources(messages_file());
objmodule_deregister_resources(Resources());
#endif
/* hide menus before deletion */
......@@ -120,17 +118,13 @@ extern _kernel_oserror *ColourMenu_finalise (int fatal, int podule, void *pw)
mem_free_all ();
#ifdef ROM
if(!__ROM) _swix(0xa2c41, 0);
#endif
return NULL;
}
/* ++++++++++++++++++++++++++++++++ initialisation code +++++++++++++++++++++++++++++++ */
extern _kernel_oserror *ColourMenu_init(char *cmd_tail, int podule_base, void *pw)
extern _kernel_oserror *ColourMenu_init(const char *cmd_tail, int podule_base, void *pw)
{
_kernel_oserror *e;
int buffer_size;
......@@ -139,10 +133,6 @@ extern _kernel_oserror *ColourMenu_init(char *cmd_tail, int podule_base, void *p
IGNORE(podule_base);
IGNORE(pw);
#ifdef ROM
__ROM = _swix(0x82c43, _IN(0), pw);
#endif
DEBUG debug_set_var_name("ColourMenu$Debug");
if ((e = rmensure ("Menu", "Toolbox.Menu", "0.22")) != NULL) return e;
......@@ -152,7 +142,7 @@ extern _kernel_oserror *ColourMenu_init(char *cmd_tail, int podule_base, void *p
*/
#ifndef ROM
if ((e = _swix(ResourceFS_RegisterFiles, _IN(0), messages_file())) != NULL)
if ((e = _swix(ResourceFS_RegisterFiles, _IN(0), Resources())) != NULL)
return e;
#endif
......@@ -244,7 +234,7 @@ extern _kernel_oserror *ColourMenu_SWI_handler(int swi_no, _kernel_swi_regs *r,
switch (swi_no)
{
case ColourMenu_ClassSWI - ColourMenu_SWIChunkBase:
case ColourMenu_ClassSWI - ColourMenu_00:
if (r->r[0] < 0 || r->r[0] >= MAX_CLASS_SWI_METHODS)
{
return make_error_hex(ColourMenu_NoSuchMethod,1,r->r[0]);
......@@ -262,15 +252,16 @@ extern _kernel_oserror *ColourMenu_SWI_handler(int swi_no, _kernel_swi_regs *r,
}
break;
case ColourMenu_PostFilter - ColourMenu_SWIChunkBase:
case ColourMenu_PostFilter - ColourMenu_00:
e = events_postfilter (r);
break;
case ColourMenu_PreFilter - ColourMenu_SWIChunkBase:
case ColourMenu_PreFilter - ColourMenu_00:
e = events_prefilter (r);
break;
default:
e = error_BAD_SWI;
break;
}
......@@ -281,7 +272,7 @@ extern _kernel_oserror *ColourMenu_SWI_handler(int swi_no, _kernel_swi_regs *r,
/* ++++++++++++++++++++++++++++++++++++++ star commands ++++++++++++++++++++++++++++++++++++*/
extern _kernel_oserror *ColourMenu_commands(char *arg_string, int argc, int cmd_no, void *pw)
extern _kernel_oserror *ColourMenu_commands(const char *arg_string, int argc, int cmd_no, void *pw)
{
IGNORE(argc);
IGNORE(pw);
......@@ -289,7 +280,7 @@ extern _kernel_oserror *ColourMenu_commands(char *arg_string, int argc, int cmd_
switch (cmd_no)
{
case 0:
case CMD_ColourMenu_Memory:
mem_print_list();
break;
......
c/miscop
View file @ 46472567
......@@ -28,15 +28,13 @@
#include "const.h"
#include "macros.h"
#include "services.h"
#include "debug.h"
#include "mem.h"
#include "string32.h"
#include "messages.h"
#include "objects.toolbox.h"
#include "objects.colourmenu.h"
#include "objects/toolbox.h"
#include "objects/colourmenu.h"
#include "main.h"
#include "auxiliary.h"
#include "object.h"
#include "task.h"
......
c/show
View file @ 46472567
......@@ -28,15 +28,14 @@
#include "const.h"
#include "macros.h"
#include "services.h"
#include "debug.h"
#include "mem.h"
#include "twimp.h"
#include "style.h"
#include "string32.h"
#include "messages.h"
#include "objects.toolbox.h"
#include "objects.ColourMenu.h"
#include "objects/toolbox.h"
#include "objects/colourmenu.h"
#include "object.h"
#include "auxiliary.h"
......
c/task
View file @ 46472567
......@@ -28,15 +28,13 @@
#include "const.h"
#include "macros.h"
#include "services.h"
#include "debug.h"
#include "mem.h"
#include "string32.h"
#include "messages.h"
#include "objects.toolbox.h"
#include "objects.colourmenu.h"
#include "objects/toolbox.h"
#include "objects/colourmenu.h"
#include "main.h"
#include "object.h"
#include "auxiliary.h"
#include "task.h"
......
cmhg/Modhdr → cmhg/ColourMenuHdr
View file @ 46472567
; Copyright 1996 Acorn Computers Ltd
; Copyright 2015 Castle Technology Ltd
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
......@@ -12,14 +12,6 @@
; See the License for the specific language governing permissions and
; limitations under the License.
;
; Title: cmhg.toolbox
; Purpose: module header for a ColourMenu Object module
; Author: TGR
; History: 18-Jan-94: TGR: version 1.00
; PRODUCT RELEASE
; 6-Feb-95: IDJ: version 0.17 fixes AQU-01196
;
#include "VersionNum"
initialisation-code: ColourMenu_init
......@@ -32,8 +24,10 @@ title-string: ColourMenu
help-string: ColourMenu Module_MajorVersion_CMHG Module_MinorVersion_CMHG
#ifdef debugging
command-keyword-table: ColourMenu_commands
ColourMenu_Memory()
#endif
swi-chunk-base-number: 0x82980
......
cmhg/Modhdr_NoD deleted 100644 → 0
View file @ 8445a02f
; Copyright 1996 Acorn Computers Ltd
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.
;
; Title: cmhg.toolbox
; Purpose: module header for a ColourMenu Object module
; Author: TGR
; History: 18-Jan-94: TGR: version 1.00
; PRODUCT RELEASE
; 6-Feb-95: IDJ: version 0.17 fixes AQU-01196
;
#include "VersionNum"
initialisation-code: ColourMenu_init
finalisation-code: ColourMenu_finalise
service-call-handler: ColourMenu_services 0x44ec1, 0x44ec2, 0x44ec3
title-string: ColourMenu
help-string: ColourMenu Module_MajorVersion_CMHG Module_MinorVersion_CMHG
swi-chunk-base-number: 0x82980
swi-handler-code: ColourMenu_SWI_handler
swi-decoding-table: ColourMenu, ClassSWI, PostFilter, PreFilter
date-string: Module_Date_CMHG
h/auxiliary
View file @ 46472567
......@@ -33,7 +33,6 @@
#include "mem.h"
#endif
#include "main.h"
#include "object.h"
#include "task.h"
......
h/main deleted 100644 → 0
View file @ 8445a02f
/* Copyright 1996 Acorn Computers Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* Title: main.h
* Purpose: main module of a ColourMenu Object module
* Author: TGR
* History: 18-Jan-94: TGR: created
*
*/
#ifndef __ColourMenu_h
#define __ColourMenu_h
#include "kernel.h"
extern _kernel_oserror *ColourMenu_init(char *cmd_tail, int podule_base, void *pw);
extern _kernel_oserror *ColourMenu_finalise (int fatal, int podule, void *pw);
extern void ColourMenu_services(int service_number, _kernel_swi_regs *r, void *pw);
extern _kernel_oserror *ColourMenu_SWI_handler(int swi_no, _kernel_swi_regs *r, void *pw);
#if debugging
extern _kernel_oserror *ColourMenu_commands(char *arg_string, int argc, int cmd_no, void *pw);
#endif
#endif