GitLab has been upgraded to 13.3.6. If you encounter any issues mail code@riscosopen.org

Commit 04b3c2b9 authored by Jeffrey Lee's avatar Jeffrey Lee

Fix to allow building against NetBSD-0_85

Detail:
  c/cmodule - Don't use NetBSD/build/service.h, it no longer exists. Use the exported USB/USBDevFS.h instead. Fix service call reason codes to use USBDevFS names.
  c/musb, c/musb_debug, c/musb_hal, c/musb_peri, c/musb_root, c/musb_usb, c/musb_util, c/tps - Strip redundant #includes
Admin:
  Tested in OMAP3 ROM build
  Build output is binary-identical to previous version
  Requires NetBSD-0_85


Version 0.22. Tagged as 'MUSBDriver-0_22'
parent 7dd2c2bc
/* (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 27 May 2014
#define Module_Date_CMHG 01 Jun 2014
#define Module_MajorVersion "0.21"
#define Module_Version 21
#define Module_MajorVersion "0.22"
#define Module_Version 22
#define Module_MinorVersion ""
#define Module_Date "27 May 2014"
#define Module_Date "01 Jun 2014"
#define Module_ApplicationDate "27-May-14"
#define Module_ApplicationDate "01-Jun-14"
#define Module_ComponentName "MUSBDriver"
#define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/USB/Controllers/MUSBDriver"
#define Module_FullVersion "0.21"
#define Module_HelpVersion "0.21 (27 May 2014)"
#define Module_LibraryVersionInfo "0:21"
#define Module_FullVersion "0.22"
#define Module_HelpVersion "0.22 (01 Jun 2014)"
#define Module_LibraryVersionInfo "0:22"
......@@ -41,8 +41,7 @@
#define __stdio_h
#include "DebugLib/DebugLib.h"
#include "../../NetBSD/build/service.h"
#include "oslib/devicefs.h"
#include "USB/USBDevFS.h"
#include "musb.h"
#include "tps.h"
......@@ -329,7 +328,7 @@ void module_services(int service_number, _kernel_swi_regs *r, void *pw)
case Service_USB:
switch (r->r[0])
{
case Service_USBDriver_Starting:
case Service_USB_USBDriverStarting:
if ((usb_soft == NULL) && !registering)
{
init_driver();
......@@ -345,7 +344,7 @@ void module_services(int service_number, _kernel_swi_regs *r, void *pw)
}
}
break;
case Service_USBDriver_Dying:
case Service_USB_USBDriverDying:
dprintf (("", "Deregistering with USB driver\n"));
/* USBDriver will do the deregistering at this point, since
it's SWIs are not active anymore */
......
......@@ -64,9 +64,6 @@
/* Have to avoid including stdio as there's a clash with the BSD stuff */
#define __stdio_h
#include "../../NetBSD/build/service.h"
#include "oslib/devicefs.h"
#include "musb.h"
#include "musb_util.h"
#include "musb_usb.h"
......
......@@ -46,8 +46,6 @@
#define __stdio_h
#include "DebugLib/DebugLib.h"
#include "../../NetBSD/build/service.h"
#include "oslib/devicefs.h"
#include "musb.h"
......
......@@ -42,8 +42,6 @@
#define __stdio_h
#include "DebugLib/DebugLib.h"
#include "../../NetBSD/build/service.h"
#include "oslib/devicefs.h"
#include "musb.h"
#include "tps.h"
......
......@@ -64,8 +64,6 @@
/* Have to avoid including stdio as there's a clash with the BSD stuff */
#define __stdio_h
#include "../../NetBSD/build/service.h"
#include "musb.h"
#include "musb_util.h"
......
......@@ -64,8 +64,6 @@
/* Have to avoid including stdio as there's a clash with the BSD stuff */
#define __stdio_h
#include "../../NetBSD/build/service.h"
#include "musb.h"
#include "musb_util.h"
#include "musb_usb.h"
......
......@@ -64,8 +64,6 @@
/* Have to avoid including stdio as there's a clash with the BSD stuff */
#define __stdio_h
#include "../../NetBSD/build/service.h"
#include "musb.h"
#include "musb_usb.h"
#include "musb_util.h"
......
......@@ -63,8 +63,6 @@
/* Have to avoid including stdio as there's a clash with the BSD stuff */
#define __stdio_h
#include "../../NetBSD/build/service.h"
#include "musb.h"
#include "musb_util.h"
......
......@@ -62,8 +62,6 @@
/* Have to avoid including stdio as there's a clash with the BSD stuff */
#define __stdio_h
#include "../../NetBSD/build/service.h"
#include "musb.h"
#include "tps.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment