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

Commit 0596bcb8 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
musb.c/musb_debug.c/musb_peri.c/musb_root.c/musb_usb.c/musb_util.c/tps.c:
  Unused reference to USBDriver.h removed
Built, but not tested.

Version 0.23. Tagged as 'MUSBDriver-0_23'
parent 04b3c2b9
......@@ -13,5 +13,5 @@
| limitations under the License.
|
dir <obey$dir>
amu CFLAGS="-fn -g" DEBUG=TRUE THROWBACK=-throwback
amu gpa.MUSBDriver CFLAGS="-fn -g" DEBUG=TRUE
amu debug DEBUG=TRUE THROWBACK=-throwback
amu gpa.MUSBDriver DEBUG=TRUE
......@@ -33,7 +33,7 @@ DEBUG ?= FALSE
ifeq (${DEBUG},TRUE)
CFLAGS += -DDEBUGLIB -DMUSB_DEBUG -DUSB_DEBUG
CMHGDEFINES += -DMUSB_DEBUG
LIBS += ${DEBUGLIBS} ${NET5LIBS}
LIBS += ${NET5LIBS}
endif
CFLAGS += -wp -wc
......@@ -43,8 +43,6 @@ CMHGDEFINES += -DCOMPONENT=${COMPONENT}
CMHGDEPENDS = cmodule musb tps
LDFLAGS = -Symbols rm.sym${TARGET}
VPATH = ^.^.build ^.^.dev.usb
include CModule
${DIRS}::
......
/* (0.22)
/* (0.23)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.22
#define Module_MajorVersion_CMHG 0.23
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 01 Jun 2014
#define Module_Date_CMHG 21 Aug 2015
#define Module_MajorVersion "0.22"
#define Module_Version 22
#define Module_MajorVersion "0.23"
#define Module_Version 23
#define Module_MinorVersion ""
#define Module_Date "01 Jun 2014"
#define Module_Date "21 Aug 2015"
#define Module_ApplicationDate "01-Jun-14"
#define Module_ApplicationDate "21-Aug-15"
#define Module_ComponentName "MUSBDriver"
#define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/USB/Controllers/MUSBDriver"
#define Module_FullVersion "0.22"
#define Module_HelpVersion "0.22 (01 Jun 2014)"
#define Module_LibraryVersionInfo "0:22"
#define Module_FullVersion "0.23"
#define Module_HelpVersion "0.23 (21 Aug 2015)"
#define Module_LibraryVersionInfo "0:23"
......@@ -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"
#include "tboxlibint/messages.h"
......
......@@ -42,7 +42,6 @@
#include "swis.h"
#include "callx/callx.h"
#endif
#include "../../NetBSD/build/USBDriver.h"
#include <limits.h>
#include <machine/bus.h>
......
......@@ -20,7 +20,6 @@
#include "swis.h"
#include "callx/callx.h"
#endif
#include "../../NetBSD/build/USBDriver.h"
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
......
......@@ -42,7 +42,6 @@
#include "swis.h"
#include "callx/callx.h"
#endif
#include "../../NetBSD/build/USBDriver.h"
#include <limits.h>
#include <machine/bus.h>
......
......@@ -42,7 +42,6 @@
#include "swis.h"
#include "callx/callx.h"
#endif
#include "../../NetBSD/build/USBDriver.h"
#include <limits.h>
#include <machine/bus.h>
......
......@@ -42,7 +42,6 @@
#include "swis.h"
#include "callx/callx.h"
#endif
#include "../../NetBSD/build/USBDriver.h"
#include <limits.h>
#include <machine/bus.h>
......
......@@ -41,7 +41,6 @@
#include "swis.h"
#include "callx/callx.h"
#endif
#include "../../NetBSD/build/USBDriver.h"
#include <limits.h>
#include <machine/bus.h>
......
......@@ -40,7 +40,6 @@
#include "modhead.h"
#include "swis.h"
#endif
#include "../../NetBSD/build/USBDriver.h"
#include <limits.h>
#include <machine/bus.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