VersionNum

-/* (5.60)
+/* (5.63)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        5.60
+#define Module_MajorVersion_CMHG        5.63
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                04 Jan 2015
+#define Module_Date_CMHG                06 Jan 2018
 
-#define Module_MajorVersion             "5.60"
-#define Module_Version                  560
+#define Module_MajorVersion             "5.63"
+#define Module_Version                  563
 #define Module_MinorVersion             ""
-#define Module_Date                     "04 Jan 2015"
+#define Module_Date                     "06 Jan 2018"
 
-#define Module_ApplicationDate          "04-Jan-15"
+#define Module_ApplicationDate          "06-Jan-18"
 
 #define Module_ComponentName            "Internet"
 #define Module_ComponentPath            "mixed/RiscOS/Sources/Networking/AUN/Internet"
 
-#define Module_FullVersion              "5.60"
-#define Module_HelpVersion              "5.60 (04 Jan 2015)"
-#define Module_LibraryVersionInfo       "5:60"
+#define Module_FullVersion              "5.63"
+#define Module_HelpVersion              "5.63 (06 Jan 2018)"
+#define Module_LibraryVersionInfo       "5:63"

build/!Mk,fd7

-| 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.
-|
-RMEnsure DDEUtils 0 RMLoad System:Modules.DDEUtils
-Dir <Obey$Dir>
-WimpSlot 3000k 3000k
-amu_machine THROWBACK=-throwback

build/!MkClean,fd7

@@ -14,4 +14,4 @@
 |
 Dir <Obey$Dir>
 amu clean
-stripdepnd Makefile
+stripdepnd

build/!MkRomLk,fd7 → build/!MkRam,fd7

-| Copyright 1998 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.
@@ -13,5 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-wimpslot 5000k
-amu_machine rom_link ADDRESS=59768832
+amu_machine standalone THROWBACK=-throwback

build/!MkRom,fd7

@@ -13,5 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-wimpslot 5000k
-amu_machine rom
+amu_machine rom THROWBACK=-throwback

build/Makefile

@@ -14,173 +14,26 @@
 #
 # Makefile for Internet
 #
-# ***********************************
-# ***    C h a n g e   L i s t    ***
-# ***********************************
-# Date       Name   Description
-# ----       ----   -----------
-# 18-Nov-94  AMcC   Created
-# 05-Jan-95  AMcC   Added resources: rule and paths
-# 21-Feb-95  AMcC   Resources now copied to AUNMsgs
-# 22-Feb-95  AMcC   Added rules to build from sources
-#
-
-#
-# Component specific options:
-#
-COMPONENT  = Internet
-ROM_MODULE = aof.Internet
-TARGET     = rm.Internet
-RDIR       = Resources
-LDIR       = ${RDIR}.${LOCALE}
-RESDIR    = ^.^.AUNMsgs.Resources.${Locale}.Resources.${COMPONENT}
-
-# amu version 5.02 can't cope with @ in VPATH so we have to use ^.build
-#
-VPATH     = ^.build ^.kern ^.net ^.netinet ^.sys ^.riscos ^.lib ^.whoami
-
-#
-# Generic options:
-#
-AS      = objasm
-CC      = cc
-CMHG    = cmhg
-CP      = copy
-LD      = link
-MKDIR   = do mkdir -p
-MODSQZ  = modsqz
-RM      = remove
-WIPE    = x wipe
-
-AFLAGS   = -depend !Depend -I<Hdr$Dir>.Global.,<Hdr$Dir>.Interface. -Stamp -quit
-CFLAGS   = -depend !Depend -zps1 -zM -ffa -Wacnp ${INCLUDES} ${DFLAGS} ${OPTS} ${THROWBACK}
-DFLAGS   = -DKERNEL -DINET -DGATEWAY -DCOMPAT_43 -DCOMPAT_OLDSOCK \
- -DDIRECTED_BROADCAST -DMULTICAST -DDELAY_EVENTS #-DMROUTING -DIPFIREWALL \
- -DIPFIREWALL_VERBOSE -DFLASHY_SCROLLLOCK -DTCPTDEBUG -DTCPDEBUG \
- #-DDIAGNOSTIC -DDEBUG_MTUDISC
-INCLUDES = -ITCPIPLibs:,C:
-CPFLAGS  = ~cfr~v
-LDFLAGS  = -linkversion 514
-WFLAGS   = ~c~v
-
-include ModuleLibs
-
-OBJS =\
- InetHdr.o\
- poduleirq.o\
- kern_subr.o\
- kern_mib.o\
- sysctl.o\
- sys_socket.o\
- uipc_mbuf.o\
- kvm.o\
- unixenv.o\
- tick_entry.o\
- if.o\
- if_loop.o\
- if_module.o\
- radix.o\
- raw_cb.o\
- raw_usrreq.o\
- route.o\
- rtsock.o\
- if_ether.o\
- igmp.o\
- in.o\
- in_cksum.o\
- ip_mroute.o\
- in_pcb.o\
- in_proto.o\
- in_rmx.o\
- ip_icmp.o\
- ip_input.o\
- ip_output.o\
- raw_ip.o\
- tcp_debug.o\
- tcp_input.o\
- tcp_output.o\
- tcp_subr.o\
- tcp_timer.o\
- tcp_usrreq.o\
- udp_usrreq.o\
- globdata.o\
- mbuf.o\
- module.o\
- setsoft.o\
- socket_swi.o\
- init.o\
- swiveneers.o\
- domain.o\
- socket.o\
- socket1.o\
- whoami.o
-#svcprint.o
-#ip_fw.o\
-#tcp_debug.o
-
-#
-# Rule patterns
-#
-.c.o:;      ${CC} -c ${CFLAGS} -o $@ $<
-.c.s:;      ${CC} -S ${CFLAGS} $<
-.cmhg.o:;   ${CMHG} -p -o $@ $<
-.s.o:;      ${AS} ${AFLAGS} $< $@
-.cmhg.h:;   ${CMHG} -p -d $@ $<
-
-#
-# Main rules:
-#
-all: ${TARGET}
-        @echo ${COMPONENT}: Module built (Relocatable)
-
-${TARGET}: ${OBJS} ${CLIB}
-        ${LD} ${LDFLAGS} -rmf -o $@ ${OBJS} ${CLIB} ${ASMUTILS} -s Syms
-        ${MODSQZ} $@
-        Access $@ WR/r
-
-rom: ${ROM_MODULE}
-        @echo ${COMPONENT}: Module built (ROM)
-
-install: ${TARGET}
-        ${MKDIR} ${INSTDIR}
-        ${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-        @echo ${COMPONENT}: Module installed (RAM)
-
-install_rom: ${ROM_MODULE}
-        ${CP} ${ROM_MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-        @echo ${COMPONENT}: Module installed (ROM)
-
-resources:
-        @echo ${COMPONENT}: Resources in AUNMsgs
-
-clean:
-        ${RM} ${ROM_MODULE}
-        ${RM} ${TARGET}
-        ${RM} Syms
-        ${WIPE} linked.* ${WFLAGS}
-        ${WIPE} map.* ${WFLAGS}
-        ${WIPE} o.* ${WFLAGS}
-        ${RM} h.InetHdr
-        @echo ${COMPONENT}: cleaned
-
-${ROM_MODULE}: ${OBJS} ${ROMCSTUBS}
-        ${LD} ${LDFLAGS} -o $@ -aof ${OBJS} ${ROMCSTUBS} ${ASMUTILS}
-
-o.socket_swi: InetHdr.h
-
-
-# final link for ROM Image (using given base address)
-rom_link: ${ROM_MODULE}
-        ${MKDIR} linked
-        ${MKDIR} map
-        ${LD} -o linked.${COMPONENT} ${LDFLAGS} -rmf -base ${ADDRESS} ${ROM_MODULE} ${ABSSYM} \
-              -map > map.${COMPONENT}
-        ${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
-        @echo ${COMPONENT}: rom_link complete
 
-BBETYPE = internet
-bbe-internet: bbe-generic
-        BBE_Export_File ^.VersionNum
+COMPONENT   = Internet
+VPATH       = ^.build ^.kern ^.net ^.netinet ^.sys ^.riscos ^.lib ^.whoami
+LIBS        = ${ASMUTILS}
+OBJS        = poduleirq kern_subr kern_mib sysctl sys_socket uipc_mbuf kvm unixenv \
+              tick_entry if if_loop if_module radix raw_cb raw_usrreq route rtsock \
+              if_ether igmp in in_cksum ip_mroute in_pcb in_proto in_rmx ip_icmp \
+              ip_input ip_output raw_ip tcp_debug tcp_input tcp_output tcp_subr tcp_timer \
+              tcp_usrreq udp_usrreq globdata mbuf module setsoft socket_swi init swiveneers \
+              domain socket socket1 whoami #svcprint ip_fw tcp_debug
+CINCLUDES   = -ITCPIPLibs:,C:
+HDRS        =
+CFLAGS      = -Wacnp 
+ROMCDEFINES = -DROM
+CMHGFILE    = InetHdr
+CMHGDEPENDS = module socket_swi
+CDEFINES    = -DKERNEL -DINET -DGATEWAY -DCOMPAT_43 -DCOMPAT_OLDSOCK -DDIRECTED_BROADCAST \
+              -DMULTICAST -DDELAY_EVENTS #-DMROUTING -DIPFIREWALL -DIPFIREWALL_VERBOSE \
+              -DFLASHY_SCROLLLOCK -DTCPTDEBUG -DTCPDEBUG -DDIAGNOSTIC -DDEBUG_MTUDISC 
+
+include CModule
 
-#---------------------------------------------------------------------------
 # Dynamic dependencies:

build/Resources/UK/Messages

+#{DictTokens}
+PERM:Operation not permitted
+NOENT:No such file or directory
+SRCH:No such process
+INTR:Interrupted system call
+IO:Input/output error
+NXIO:Device not configured
+2BIG:Argument list too long
+NOEXEC:Exec format error
+BADF:Bad file descriptor
+CHILD:No child processes
+DEADLK:Resource deadlock avoided
+NOMEM:Cannot allocate memory
+ACCES:Permission denied
+FAULT:Bad address
+NOTBLK:Block device required
+BUSY:Device busy
+EXIST:File exists
+XDEV:Cross-device link
+NODEV:Operation not supported by device
+NOTDIR:Not a directory
+ISDIR:Is a directory
+INVAL:Invalid argument
+NFILE:Too many open files in system
+MFILE:Too many open files
+NOTTY:Inappropriate ioctl for device
+TXTBSY:Text file busy
+FBIG:File too large
+NOSPC:No space left on device
+SPIPE:Illegal seek
+ROFS:Read-only file system
+MLINK:Too many links
+PIPE:Broken pipe
+DOM:Numerical argument out of domain
+RANGE:Result too large
+AGAIN/WOULDBLOCK:Resource temporarily unavailable
+INPROGRESS:Operation now in progress
+ALREADY:Operation already in progress
+NOTSOCK:Socket operation on non-socket
+DESTADDRREQ:Destination address required
+MSGSIZE:Message too long
+PROTOTYPE:Protocol wrong type for socket
+NOPROTOOPT:Protocol not available
+PROTONOSUPPORT:Protocol not supported
+SOCKTNOSUPPORT:Socket type not supported
+OPNOTSUPP:Operation not supported
+PFNOSUPPORT:Protocol family not supported
+AFNOSUPPORT:Address family not supported by protocol family
+ADDRINUSE:Address already in use
+ADDRNOTAVAIL:Can't assign requested address
+NETDOWN:Network is down
+NETUNREACH:Network is unreachable
+NETRESET:Network dropped connection on reset
+CONNABORTED:Software caused connection abort
+CONNRESET:Connection reset by peer
+NOBUFS:No buffer space available
+ISCONN:Socket is already connected
+NOTCONN:Socket is not connected
+SHUTDOWN:Can't send after socket shutdown
+TOOMANYREFS:Too many references: can't splice
+TIMEDOUT:Operation timed out
+CONNREFUSED:Connection refused
+LOOP:Too many levels of symbolic links
+NAMETOOLONG:File name too long
+HOSTDOWN:Host is down
+HOSTUNREACH:No route to host
+NOTEMPTY:Directory not empty
+PROCLIM:Too many processes
+USERS:Too many users
+DQUOT:Disc quota exceeded
+STALE:Stale NFS file handle
+REMOTE:Too many levels of remote in path
+BADRPC:RPC struct is bad
+RPCMISMATCH:RPC version wrong
+PROGUNAVAIL:RPC prog. not avail
+PROGMISMATCH:Program version wrong
+PROCUNAVAIL:Bad procedure for program
+NOLCK:No locks available
+NOSYS:Function not implemented
+FTYPE:Inappropriate file type or format
+AUTH:Authentication error
+NEEDAUTH:Need authentication
+ModName:Internet
+IntErr:Internal error
+IfBad:data structures (ifnet) corrupted
+MmBad:cannot initialise memory management
+InvalSWI:invalid SWI number
+NoMm:no mbuf manager, module inactive
+Paniced:module has suffered an unrecoverable error
+BadCli:bad CLI command
+MlcFail:out of memory - malloc failed
+IsAct:Packet forwarding in operation
+NotAct:Packet forwarding not in operation
+ResUse:Resource Usage
+ResSkt:Sockets active
+NoIf:No interfaces found
+InfoP:Use *InetStat -s to examine per-protocol statistics
+# Help is code, so these help & syntax aren't in CmdHelp
+HInInfo:*InetInfo displays Internet internal and per-protocol statistics
+SInInfo:Syntax: *InetInfo [r] [i]
+HInGate:*InetGateway enables or disables packet forwarding
+SInGate:Syntax: *InetGateway [on|off]

build/cmhg/InetHdr

@@ -18,6 +18,7 @@
 ; Copyright (c) 1994 Acorn Computers Ltd., Cambridge, England
 ;
 #include "../VersionNum"
+#include "Global/Services.h"
 
 title-string:           Internet
 
@@ -31,7 +32,11 @@ initialisation-code:    inet_init
 
 finalisation-code:      inet_final
 
-service-call-handler:   sc_handler 0x45 0x5e 0x9d 0xa2
+international-help-file: "Resources:$.Resources.Internet.Messages"
+
+service-call-handler:   sc_handler Service_ResourceFSStarting,
+                                   Service_DCIDriverStatus,
+                                   Service_MbufManagerStatus
 
 swi-chunk-base-number:  0x41200
 

build/h/swiveneers

@@ -34,6 +34,8 @@ extern void             messagetrans_close_file(u_long *fd);
 extern _kernel_oserror *messagetrans_lookup(u_long *fd, const char *token,
                                             char *buffer, int size,
                                             char **result);
+extern _kernel_oserror *resourcefs_register_files(void *resarea);
+extern _kernel_oserror *resourcefs_deregister_files(void *resarea);
 extern void             service_dci_protocol_status(void *wsp, int status,
                                                     int ver, const u_char *title);
 extern void             service_internetstatus_address_changed(void);

lib/c/unixenv

@@ -48,8 +48,7 @@
 #include "module.h"
 #include "AsmUtils/callbacks.h"
 #include "Global/HALEntries.h"
-
-#define TickerV  28
+#include "Global/RISCOS.h"
 
 #define NCALLOUT 20
 
@@ -75,12 +74,6 @@ volatile int callo_pending;
 extern void *module_wsp;
 extern int paniced;
 
-#define INTERNET_EVENT	    19
-
-#define SOCKET_ASYNC_EVENT  1
-#define SOCKET_URGENT_EVENT 2
-#define SOCKET_BROKEN_EVENT 3
-
 #ifdef DELAY_EVENTS
 long siglist[SOCKTABSIZE];
 #endif
@@ -168,15 +161,15 @@ generate_event(sockid, sig)
     switch (sig)
     {
       case SIGIO:
-	event = SOCKET_ASYNC_EVENT;
+	event = Event_Internet_SocketAsync;
 	break;
 
       case SIGURG:
-	event = SOCKET_URGENT_EVENT;
+	event = Event_Internet_SocketUrgent;
 	break;
 
       case SIGPIPE:
-	event = SOCKET_BROKEN_EVENT;
+	event = Event_Internet_SocketBroken;
 	break;
 
       default:
@@ -184,7 +177,7 @@ generate_event(sockid, sig)
     }
 
 #   ifdef NO_PORT_EVENT
-    return os_generate_event(INTERNET_EVENT, event, sockid, 0) ? -1 : 0;
+    return os_generate_event(Event_Internet, event, sockid, 0) ? -1 : 0;
 #   else
     /* If it's an Inet socket, fill in R3 with the local port number */
     so=getsock(sockid);
@@ -196,7 +189,7 @@ generate_event(sockid, sig)
             port = inp->inp_lport;
     }
 
-    return os_generate_event(INTERNET_EVENT, event, sockid, port) ? -1 : 0;
+    return os_generate_event(Event_Internet, event, sockid, port) ? -1 : 0;
 #   endif
 }
 

lib/s/tick_entry

@@ -181,10 +181,14 @@ P_callbackerr
         ; Extracted from ARM Architecture Reference
         EXPORT  ntohl
 ntohl                                   ; a1 = A , B , C , D
+      [ NoARMv6
         EOR     a2, a1, a1, ROR #16     ; a2 = A^C,B^D,C^A,D^B
         BIC     a2, a2, #&ff0000        ; a2 = A^C, 0 ,C^A,D^B
         MOV     a1, a1, ROR #8          ; a1 = D , A , B , C
         EOR     a1, a1, a2, LSR #8      ; a1 = D , C , B , A
+      |
+        REV     a1, a1                  ; a1 = D , C , B , A
+      ]
         Return  ,LinkNotStacked
 
         END

riscos/c/module

@@ -144,7 +144,7 @@ static int errcount;
 static int inactive = 1;
 static int finalising;
 
-static const char *MsgFile = "Resources:$.Resources.Internet.Messages";
+extern void *Resources(void); /* From ResGen */
 static u_long msgfd[4];
 static int msgs_active;
 
@@ -182,6 +182,13 @@ static _kernel_oserror *init_msgs(const char *filename, u_long *fd)
 {
     _kernel_oserror *e;
 
+#ifndef ROM
+    /*
+     * put our messages into ResourceFS
+     */
+    if( (e = resourcefs_register_files(Resources())) != NULL )
+	return(e);
+#endif
     /*
      * this code was ripped off from SCormie, guess this first
      * call is to check that the messages file is present.
@@ -216,6 +223,9 @@ static void release_msgs(u_long *fd)
     msgs_active = 0;
 
     messagetrans_close_file(fd);
+#ifndef ROM
+    resourcefs_deregister_files(Resources());
+#endif
 }
 
 /**********************************************************************/
@@ -239,17 +249,6 @@ static char *lookup_tag(const char *tag)
 
 /**********************************************************************/
 
-/*
- * handle_messagefile - MessageFileClosed service call has been
- * received, so re-open the file if necssary.
- */
-static void handle_messagefile(_kernel_swi_regs *r)
-{
-    (void)init_msgs(MsgFile, msgfd);
-}
-
-/**********************************************************************/
-
 /*
  * builderrmess - build an internationalised error message
  */
@@ -1233,9 +1232,10 @@ _kernel_oserror *inet_init(const char *cmd_tail, int pbase, void *pw)
 
     /*
      * open MessageTrans file
-     * It is *not* a fatal error if the messages file cannot be opened
+     * It is a fatal error if the messages file cannot be opened
      */
-    init_msgs(MsgFile, msgfd);
+    if( (e = init_msgs(Module_MessagesFile, msgfd)) != NULL )
+	return(e);
 
     /*
      * Seed RNG, based on time (with high precision) and our MAC address.
@@ -1306,14 +1306,11 @@ void sc_handler(int sn, _kernel_swi_regs *r, void *pw)
 {
     switch(sn)
     {
-      case Service_PreReset:
-	inet_final(1, 0, NULL);
+#ifndef ROM
+      case Service_ResourceFSStarting:
+	(*(void (*)(void *, void *, void *, void *))r->r[2])(Resources(), 0, 0, (void *)r->r[3]);
 	break;
-
-      case Service_MessageFileClosed:
-	handle_messagefile(r);
-	break;
-
+#endif
       case Service_DCIDriverStatus:
 	handle_dcidriverstatus(r);
 	break;

riscos/s/swiveneers

@@ -21,6 +21,7 @@
         GET     Hdr:MsgTrans
         GET     Hdr:Services
         GET     Hdr:OsWords
+        GET     Hdr:ResourceFS
         GET     Hdr:Portable
         GET     Hdr:TaskWindow
         GET     Hdr:Econet
@@ -36,38 +37,40 @@ InternetStatus_DynamicBootReply *       4
 InternetStatus_DynamicBootInform *      7
 InternetStatus_DuplicateIPAddress *     8
 
-        EXPORT  mbuf_open_session
+        EXPORT  econet_inet_rx_direct
         EXPORT  mbufcontrol_version
         EXPORT  mbuf_close_session
+        EXPORT  mbuf_open_session
+        EXPORT  messagetrans_close_file
         EXPORT  messagetrans_file_info
-        EXPORT  messagetrans_open_file
         EXPORT  messagetrans_lookup
-        EXPORT  messagetrans_close_file
-        EXPORT  service_dci_protocol_status
-        EXPORT  service_internetstatus_address_changed
-        EXPORT  service_internetstatus_interface_updown
-        EXPORT  service_internetstatus_dynamicboot_start
-        EXPORT  service_internetstatus_dynamicboot_reply
-        EXPORT  service_internetstatus_dynamicboot_inform
-        EXPORT  service_internetstatus_duplicate_ip_address
-        EXPORT  service_enumerate_network_drivers
-        EXPORT  osmodule_free
+        EXPORT  messagetrans_open_file
         EXPORT  osmodule_claim
-        EXPORT  os_read_monotonic_time
-        EXPORT  os_generate_event
+        EXPORT  osmodule_free
+        EXPORT  osreadsysinfo_hardware0
+        EXPORT  osreadsysinfo_machineid
+        EXPORT  osword_read_realtime
+        EXPORT  os_add_call_back
         EXPORT  os_claim
+        EXPORT  os_generate_event
+        EXPORT  os_read_escape_state
+        EXPORT  os_read_monotonic_time
         EXPORT  os_release
-        EXPORT  os_add_call_back
         EXPORT  os_remove_call_back
-        EXPORT  taskwindow_task_info
         EXPORT  os_upcall
-        EXPORT  econet_inet_rx_direct
-        EXPORT  osreadsysinfo_hardware0
-        EXPORT  osreadsysinfo_machineid
-        EXPORT  osword_read_realtime
-        EXPORT  portable_read_features
         EXPORT  portable_idle
-        EXPORT  os_read_escape_state
+        EXPORT  portable_read_features
+        EXPORT  resourcefs_register_files
+        EXPORT  resourcefs_deregister_files
+        EXPORT  service_dci_protocol_status
+        EXPORT  service_enumerate_network_drivers
+        EXPORT  service_internetstatus_address_changed
+        EXPORT  service_internetstatus_duplicate_ip_address
+        EXPORT  service_internetstatus_dynamicboot_inform
+        EXPORT  service_internetstatus_dynamicboot_reply
+        EXPORT  service_internetstatus_dynamicboot_start
+        EXPORT  service_internetstatus_interface_updown
+        EXPORT  taskwindow_task_info
 
         AREA    swiveneers,CODE,READONLY,PIC
 
@@ -143,6 +146,22 @@ messagetrans_close_file
         SWI     XMessageTrans_CloseFile
         Return  ,LinkNotStacked,,ip
 
+; _kernel_oserror *resourcefs_register_files(void *resarea);
+        ROUT
+resourcefs_register_files
+        MOV     ip,lr
+        SWI     XResourceFS_RegisterFiles
+        MOVVC   a1,#0
+        Return  ,LinkNotStacked,,ip
+
+; _kernel_oserror *resourcefs_deregister_files(void *resarea);
+        ROUT
+resourcefs_deregister_files
+        MOV     ip,lr
+        SWI     XResourceFS_DeregisterFiles
+        MOVVC   a1,#0
+        Return  ,LinkNotStacked,,ip
+
 ; void service_dci_protocol_status(void *wsp, int status, int ver, const char *title)
         ROUT
 service_dci_protocol_status

whoami/c/whoami

@@ -55,6 +55,7 @@
 #include "kernel.h"
 #include "swis.h"
 #include "AsmUtils/callbacks.h"
+#include "Global/RISCOS.h"
 
 #include "sys/types.h"
 #include "sys/param.h"
@@ -165,10 +166,6 @@ static int left_alt_is_pressed(void), right_alt_is_pressed(void);
 #define MAX_SMTPSERVERS		3
 #define MAX_GENERICSERVERS	3
 
-#define Internet_Event	 19
-#define RarpReply	  4
-#define RarpRequest	  5
-
 static int whoami_claimed_frames;
 
 int
@@ -1073,7 +1070,7 @@ revarpinput(struct mbuf *m)
 	     */
 	    memcpy(&thisip, ea->arp_tpa, sizeof thisip);
 	    memcpy(&serverip, ea->arp_spa, sizeof serverip);
-	    os_generate_event(Internet_Event, RarpReply, (int)serverip.s_addr, (int)thisip);
+	    os_generate_event(Event_Internet, Event_Internet_RevARPReply, (int)serverip.s_addr, (int)thisip);
 	}
 
 	break;
@@ -1116,7 +1113,7 @@ revarpinput(struct mbuf *m)
 	}
 	else
 	{
-		os_generate_event(Internet_Event, RarpRequest, (int) m, ac->ac_if.if_swibase);
+		os_generate_event(Event_Internet, Event_Internet_RevARPRequest, (int) m, ac->ac_if.if_swibase);
 	}
 
 	break;
@@ -1143,7 +1140,7 @@ revarpinput(struct mbuf *m)
  * so the ioctl() has now been changed to SIOCSWHOTHEYARE.
  *
  * The routine broadcasts a REVARP_REPLY packet, which AUN clients
- * pick up (via the RarpReply Internet event), and fill in the blank
+ * pick up (via the RevARPReply Internet event), and fill in the blank
  * target address field (ea->arp_tha[3]) with their station number
  * from CMOS RAM.  This is all so disgusting it makes my head hurt.
  *