summaryrefslogtreecommitdiff
path: root/tinyusb/device
diff options
context:
space:
mode:
Diffstat (limited to 'tinyusb/device')
-rw-r--r--tinyusb/device/dcd.c3
-rw-r--r--tinyusb/device/dcd.h5
-rw-r--r--tinyusb/device/romdriver/mw_usbd_rom_api.h1
-rw-r--r--tinyusb/device/romdriver/power_api.h88
4 files changed, 3 insertions, 94 deletions
diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c
index de9e4f07d..3fabf0e51 100644
--- a/tinyusb/device/dcd.c
+++ b/tinyusb/device/dcd.c
@@ -41,11 +41,10 @@
// TODO refractor later
#include "descriptors.h"
-#include <cr_section_macros.h>
// TODO dcd abstract later
#define USB_ROM_SIZE (1024*2)
-uint8_t usb_RomDriver_buffer[USB_ROM_SIZE] ATTR_ALIGNED(2048) __DATA(RAM2);
+uint8_t usb_RomDriver_buffer[USB_ROM_SIZE] ATTR_ALIGNED(2048) TUSB_ATTR_RAM_SECTION;
USBD_HANDLE_T g_hUsb;
static volatile bool isConfigured = false;
diff --git a/tinyusb/device/dcd.h b/tinyusb/device/dcd.h
index 65eb80da4..89eb3fef4 100644
--- a/tinyusb/device/dcd.h
+++ b/tinyusb/device/dcd.h
@@ -58,9 +58,8 @@
#include "common/common.h"
#ifdef DEVICE_ROMDRIVER
-#include "romdriver/mw_usbd_rom_api.h"
-#include "romdriver/power_api.h"
-#define USBD_API ((*(ROM **)(0x1FFF1FF8))->pUSBD) // TODO HAL
+ #include "romdriver/mw_usbd_rom_api.h"
+ #define USBD_API ((USBD_API_T*) DEVICE_ROM_DRIVER_ADDR)
#endif
diff --git a/tinyusb/device/romdriver/mw_usbd_rom_api.h b/tinyusb/device/romdriver/mw_usbd_rom_api.h
index aa18838fe..4ece16f2b 100644
--- a/tinyusb/device/romdriver/mw_usbd_rom_api.h
+++ b/tinyusb/device/romdriver/mw_usbd_rom_api.h
@@ -39,7 +39,6 @@
#include "mw_usbd_dfuuser.h"
#include "mw_usbd_hiduser.h"
#include "mw_usbd_cdcuser.h"
-//#include "power_api.h"
/** \brief Main USBD API functions structure.
* \ingroup Group_USBD
diff --git a/tinyusb/device/romdriver/power_api.h b/tinyusb/device/romdriver/power_api.h
deleted file mode 100644
index f95021774..000000000
--- a/tinyusb/device/romdriver/power_api.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
- * $Id:: power_api.h 6249 2011-01-25 19:23:47Z usb01267 $
- * Project: NXP LPC13Uxx software example
- *
- * Description:
- * Power API Header File for NXP LPC13Uxx Device Series
- *
- ****************************************************************************
- * Software that is described herein is for illustrative purposes only
- * which provides customers with programming information regarding the
- * products. This software is supplied "AS IS" without any warranties.
- * NXP Semiconductors assumes no responsibility or liability for the
- * use of the software, conveys no license or title under any patent,
- * copyright, or mask work right to the product. NXP Semiconductors
- * reserves the right to make changes in the software without
- * notification. NXP Semiconductors also make no representation or
- * warranty that such application will be suitable for the specified
- * use without further testing or modification.
-****************************************************************************/
-#ifndef __LPC13UXX_POWER_API_H__
-#define __LPC13UXX_POWER_API_H__
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-#define PWRROMD_PRESENT
-
-#define USBROMD_PRESENT
-
-#ifdef USBROMD_PRESENT
-#include "mw_usbd_rom_api.h"
-#endif
-
-typedef struct _PWRD {
- void (*set_pll)(unsigned int cmd[], unsigned int resp[]);
- void (*set_power)(unsigned int cmd[], unsigned int resp[]);
-} PWRD;
-
-typedef struct _ROM {
-#ifdef USBROMD_PRESENT
- const USBD_API_T * pUSBD;
-#else
- const unsigned p_usbd;
-#endif /* USBROMD_PRESENT */
- const unsigned p_clib;
- const unsigned p_cand;
-#ifdef PWRROMD_PRESENT
- const PWRD * pPWRD;
-#else
- const unsigned p_pwrd;
-#endif /* PWRROMD_PRESENT */
- const unsigned p_dev1;
- const unsigned p_dev2;
- const unsigned p_dev3;
- const unsigned p_dev4;
-} ROM;
-
-//PLL setup related definitions
-#define CPU_FREQ_EQU 0 //main PLL freq must be equal to the specified
-#define CPU_FREQ_LTE 1 //main PLL freq must be less than or equal the specified
-#define CPU_FREQ_GTE 2 //main PLL freq must be greater than or equal the specified
-#define CPU_FREQ_APPROX 3 //main PLL freq must be as close as possible the specified
-
-#define PLL_CMD_SUCCESS 0 //PLL setup successfully found
-#define PLL_INVALID_FREQ 1 //specified freq out of range (either input or output)
-#define PLL_INVALID_MODE 2 //invalid mode (see above for valid) specified
-#define PLL_FREQ_NOT_FOUND 3 //specified freq not found under specified conditions
-#define PLL_NOT_LOCKED 4 //PLL not locked => no changes to the PLL setup
-
-//power setup elated definitions
-#define PARAM_DEFAULT 0 //default power settings (voltage regulator, flash interface)
-#define PARAM_CPU_PERFORMANCE 1 //setup for maximum CPU performance (higher current, more computation)
-#define PARAM_EFFICIENCY 2 //balanced setting (power vs CPU performance)
-#define PARAM_LOW_CURRENT 3 //lowest active current, lowest CPU performance
-
-#define PARAM_CMD_SUCCESS 0 //power setting successfully found
-#define PARAM_INVALID_FREQ 1 //specified freq out of range (=0 or > 50 MHz)
-#define PARAM_INVALID_MODE 2 //specified mode not valid (see above for valid)
-
-#define MAX_CLOCK_KHZ_PARAM 50000
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __LPC13UXX_POWER_API_H__ */
-