From 3ecbf678db6c0833594f7903fb3fc22803fdd66d Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 3 Mar 2017 02:10:34 +0100 Subject: [PATCH] only simtrace is bus-powered, SAM3 on qmod + owhw are self-powered --- firmware/libboard/common/include/board_common.h | 5 ----- firmware/libboard/owhw/include/board.h | 2 ++ firmware/libboard/qmod/include/board.h | 2 ++ firmware/libboard/simtrace/include/board.h | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index 9a7c8d88..b689d867 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -102,11 +102,6 @@ #define BOARD_USB_ENDPOINTS_MAXPACKETSIZE(i) (((i == 4) || (i == 5))? 512 : 64) #define BOARD_USB_ENDPOINTS_BANKS(i) (((i == 0) || (i == 3)) ? 1 : 2) -/// USB attributes configuration descriptor (bus or self powered, remote wakeup) -//#define BOARD_USB_BMATTRIBUTES USBConfigurationDescriptor_SELFPOWERED_NORWAKEUP -#define BOARD_USB_BMATTRIBUTES USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP -//#define BOARD_USB_BMATTRIBUTES USBConfigurationDescriptor_SELFPOWERED_RWAKEUP - #define BOARD_USB_VENDOR SIMTRACE_VENDOR_ID #define BOARD_USB_PRODUCT SIMTRACE_PRODUCT_ID #define BOARD_USB_RELEASE 0 diff --git a/firmware/libboard/owhw/include/board.h b/firmware/libboard/owhw/include/board.h index c5e67d1e..eebdb585 100644 --- a/firmware/libboard/owhw/include/board.h +++ b/firmware/libboard/owhw/include/board.h @@ -41,6 +41,8 @@ #define PINS_CARDSIM { PIN_SET_USIM1_PRES, PIN_SET_USIM2_PRES } +#define BOARD_USB_BMATTRIBUTES USBConfigurationDescriptor_SELFPOWERED_NORWAKEUP + #define SIMTRACE_VENDOR_ID 0x1d50 #define SIMTRACE_PRODUCT_ID 0x60e3 /* FIXME */ #define USB_VENDOR_ID SIMTRACE_VENDOR_ID diff --git a/firmware/libboard/qmod/include/board.h b/firmware/libboard/qmod/include/board.h index 16a38a8d..106d5d06 100644 --- a/firmware/libboard/qmod/include/board.h +++ b/firmware/libboard/qmod/include/board.h @@ -55,6 +55,8 @@ #define PIN_VERSION_DET {PIO_PA19, PIOA, ID_PIOA, PIO_PERIPH_D, PIO_DEFAULT} +#define BOARD_USB_BMATTRIBUTES USBConfigurationDescriptor_SELFPOWERED_NORWAKEUP + #define SIMTRACE_VENDOR_ID 0x1d50 #define SIMTRACE_PRODUCT_ID 0x60e3 /* FIXME */ #define USB_VENDOR_ID SIMTRACE_VENDOR_ID diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index 6d11dae7..1774e31e 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -74,6 +74,8 @@ /// SPI chip select 0 pin definition (PA11). #define PIN_SPI_NPCS0 {1 << 11, PIOA, PIOA, PIO_PERIPH_A, PIO_DEFAULT} +#define BOARD_USB_BMATTRIBUTES USBConfigurationDescriptor_BUSPOWERED_NORWAKEUP + #define SIMTRACE_VENDOR_ID 0x1d50 #define SIMTRACE_PRODUCT_ID 0x60e3 #define USB_VENDOR_ID SIMTRACE_VENDOR_ID