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

Commit 88a7fa72 authored by Robert Sprowson's avatar Robert Sprowson

Don't reach into USBDriver's back pocket

cmodule.c:
  Use USBDriver.h from interface exports
Makefile:
  Remove duplicated libs from debug build
  Remove relative reference to NetBSD component from VPATH
!MkDebug:
  Select debug target so the right compiler switches are used
Built, but not tested.

Version 0.20. Tagged as 'DWCDriver-0_20'
parent 39e2d3a4
......@@ -13,5 +13,5 @@
| limitations under the License.
|
dir <obey$dir>
amu DEBUG=TRUE THROWBACK=-throwback
amu debug DEBUG=TRUE THROWBACK=-throwback
amu gpa.DWCDriver DEBUG=TRUE
......@@ -33,7 +33,7 @@ DEBUG ?= FALSE
ifeq (${DEBUG},TRUE)
CFLAGS += -DDEBUGLIB -DDWCDRIVER_DEBUG -DDEBUG -DUSB_DEBUG
CMHGDEFINES += -DDWCDRIVER_DEBUG
LIBS += ${DEBUGLIBS} ${NET5LIBS}
LIBS += ${NET5LIBS}
endif
CFLAGS += -wp -wc
......@@ -43,7 +43,7 @@ CMHGDEFINES += -DCOMPONENT=${COMPONENT}
CMHGDEPENDS = cmodule dwc_otg_riscos softc_root softc_device
LDFLAGS = -Symbols rm.sym${TARGET}
VPATH = ^.^.build ^.^.dev.usb dwc.driver dwc.dwc_common_port
VPATH = dwc.driver dwc.dwc_common_port
# DWC bits
CFLAGS += -DDWC_EN_ISOC -Idwc.dwc_common_port -DDWC_HOST_ONLY
......
/* (0.19)
/* (0.20)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.19
#define Module_MajorVersion_CMHG 0.20
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 28 Mar 2015
#define Module_Date_CMHG 21 Aug 2015
#define Module_MajorVersion "0.19"
#define Module_Version 19
#define Module_MajorVersion "0.20"
#define Module_Version 20
#define Module_MinorVersion ""
#define Module_Date "28 Mar 2015"
#define Module_Date "21 Aug 2015"
#define Module_ApplicationDate "28-Mar-15"
#define Module_ApplicationDate "21-Aug-15"
#define Module_ComponentName "DWCDriver"
#define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/USB/Controllers/DWCDriver"
#define Module_FullVersion "0.19"
#define Module_HelpVersion "0.19 (28 Mar 2015)"
#define Module_LibraryVersionInfo "0:19"
#define Module_FullVersion "0.20"
#define Module_HelpVersion "0.20 (21 Aug 2015)"
#define Module_LibraryVersionInfo "0:20"
......@@ -13,7 +13,6 @@
* limitations under the License.
*/
#include "modhead.h"
#include "../../NetBSD/build/USBDriver.h"
#include "swis.h"
#include <stdlib.h>
#include <string.h>
......@@ -33,6 +32,7 @@
#include "Global/RISCOS.h"
#include "Global/Services.h"
#include "Global/HALEntries.h"
#include "Interface/USBDriver.h"
#include "callx/callx.h"
#include "cmodule.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