From a1012b170adc8630e3b6d1dd8edd277176d7b979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Redon?= Date: Sun, 1 Jul 2018 18:11:01 +0200 Subject: USB: add central file to define USB IDs, classes, and endpoints Change-Id: Iba81f32a92c68a973e8e7adbc4c2a1064ba5290f --- firmware/libboard/common/include/board_common.h | 15 --------------- firmware/libboard/owhw/include/board.h | 1 + firmware/libboard/qmod/include/board.h | 1 + firmware/libboard/simtrace/include/board.h | 1 + 4 files changed, 3 insertions(+), 15 deletions(-) (limited to 'firmware/libboard') diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index 64bdf0f..a995d88 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -108,21 +108,6 @@ // D+ has external pull-up #define BOARD_USB_PULLUP_EXTERNAL -#define BOARD_USB_NUMENDPOINTS 8 - -// FIXME: in all other cases return 0? -#define BOARD_USB_ENDPOINTS_MAXPACKETSIZE(i) (((i == 4) || (i == 5))? 512 : 64) -#define BOARD_USB_ENDPOINTS_BANKS(i) (((i == 0) || (i == 3)) ? 1 : 2) - -#define USB_VENDOR_OPENMOKO 0x1d50 -#define USB_PRODUCT_OWHW_SAM3_DFU 0x4001 /* was 0x4000 */ -#define USB_PRODUCT_OWHW_SAM3 0x4001 -#define USB_PRODUCT_QMOD_HUB 0x4002 -#define USB_PRODUCT_QMOD_SAM3_DFU 0x4004 /* was 0x4003 */ -#define USB_PRODUCT_QMOD_SAM3 0x4004 -#define USB_PRODUCT_SIMTRACE2_DFU 0x60e3 /* was 0x60e2 */ -#define USB_PRODUCT_SIMTRACE2 0x60e3 - #define BOARD_USB_DFU #define BOARD_DFU_BOOT_SIZE (16 * 1024) #define BOARD_DFU_RAM_SIZE (2 * 1024) diff --git a/firmware/libboard/owhw/include/board.h b/firmware/libboard/owhw/include/board.h index c770749..def3d8b 100644 --- a/firmware/libboard/owhw/include/board.h +++ b/firmware/libboard/owhw/include/board.h @@ -1,5 +1,6 @@ #pragma once #include "board_common.h" +#include "simtrace_usb.h" /** Name of the board */ #define BOARD_NAME "OWHW" diff --git a/firmware/libboard/qmod/include/board.h b/firmware/libboard/qmod/include/board.h index b8af8d8..2db94ab 100644 --- a/firmware/libboard/qmod/include/board.h +++ b/firmware/libboard/qmod/include/board.h @@ -1,5 +1,6 @@ #pragma once #include "board_common.h" +#include "simtrace_usb.h" #define LED_USIM1 LED_GREEN #define LED_USIM2 LED_RED diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index 891ab33..b21d4fb 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -1,5 +1,6 @@ #pragma once #include "board_common.h" +#include "simtrace_usb.h" /* Name of the board */ #define BOARD_NAME "SAM3S-SIMTRACE" -- cgit v1.2.3