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

Commit 1d60fab9 authored by Robert Sprowson's avatar Robert Sprowson

Build fix

Having updated the central 'usb.h' to include some of the more recent definitions this has created a clash here.
UHF_PORT_L1 isn't 5 according to the USB 2.0 spec, but since the only use of it in DWCDriver is wrapped in CONFIG_USB_DWC_OTG_LPM which isn't enabled in this port, just delete it.
UHF_C_PORT_L1 is now defined in 'usb.h', delete local copy.
UHF_PORT_HIGH_SPEED remains. In fact, it looks like the ported driver got confused when responding to GET_PORT_STATUS as it builds the status word out of bitmasks defined for hub feature manipulation (UHF) not port status (UPS) which are different number spaces. Oops.

Version 0.18. Tagged as 'DWCDriver-0_18'
parent ef249dac
/* (0.17)
/* (0.18)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.17
#define Module_MajorVersion_CMHG 0.18
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 18 Oct 2014
#define Module_Date_CMHG 31 Oct 2014
#define Module_MajorVersion "0.17"
#define Module_Version 17
#define Module_MajorVersion "0.18"
#define Module_Version 18
#define Module_MinorVersion ""
#define Module_Date "18 Oct 2014"
#define Module_Date "31 Oct 2014"
#define Module_ApplicationDate "18-Oct-14"
#define Module_ApplicationDate "31-Oct-14"
#define Module_ComponentName "DWCDriver"
#define Module_ComponentPath "mixed/RiscOS/Sources/HWSupport/USB/Controllers/DWCDriver"
#define Module_FullVersion "0.17"
#define Module_HelpVersion "0.17 (18 Oct 2014)"
#define Module_LibraryVersionInfo "0:17"
#define Module_FullVersion "0.18"
#define Module_HelpVersion "0.18 (31 Oct 2014)"
#define Module_LibraryVersionInfo "0:18"
......@@ -89,9 +89,7 @@
#define WUF_COUNT_PACKETS 0x2
#define WUF_CAPTURE_PACKETS 0x3
#define UHF_PORT_L1 5
#define UHF_PORT_HIGH_SPEED 10
#define UHF_C_PORT_L1 23
#define UHF_PORT_HIGH_SPEED 10 /* This should really be using UPS_HIGH_SPEED */
/* A few extra defines that are in this old usb.h but not our current one */
......
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