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

Commit 689a0ad0 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.
Admin:
  Tested in BCM2835 ROM build
  Build output is binary-identical to previous version
  Requires NetBSD-0_85


Version 0.14. Tagged as 'DWCDriver-0_14'
parent 2a5d6d19
/* (0.13)
/* (0.14)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.13
#define Module_MajorVersion_CMHG 0.14
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 06 May 2014
#define Module_Date_CMHG 01 Jun 2014
#define Module_MajorVersion "0.13"
#define Module_Version 13
#define Module_MajorVersion "0.14"
#define Module_Version 14
#define Module_MinorVersion ""
#define Module_Date "06 May 2014"
#define Module_Date "01 Jun 2014"
#define Module_ApplicationDate "06-May-14"
#define Module_ApplicationDate "01-Jun-14"
#define Module_ComponentName "DWCDriver"
#define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/USB/Controllers/DWCDriver"
#define Module_FullVersion "0.13"
#define Module_HelpVersion "0.13 (06 May 2014)"
#define Module_LibraryVersionInfo "0:13"
#define Module_FullVersion "0.14"
#define Module_HelpVersion "0.14 (01 Jun 2014)"
#define Module_LibraryVersionInfo "0:14"
......@@ -40,8 +40,7 @@
#define __stdio_h
#include "DebugLib/DebugLib.h"
#include "../../NetBSD/build/service.h"
#include "oslib/devicefs.h"
#include "USB/USBDevFS.h"
#include "dwc_common_riscos.h"
#include "dwc_os.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)
{
_kernel_oserror *e = init_driver();
......@@ -351,7 +350,7 @@ void module_services(int service_number, _kernel_swi_regs *r, void *pw)
}
break;
#if 0 /* Don't shutdown the driver here, wait for ModulePostFinal. This avoids us having to deal with USBDriver calling us to close pipes and cancel transfers after we've shutdown the DWC layer */
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 */
......
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