uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove pinxmux_type_t and PeripheralDescriptor.pinmuxConfig

Browse Source
This commit is contained in:
László Monda
2017-04-15 02:50:03 +02:00
parent 8ae8349d20
commit 11c6291770
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/src/buspal/bl_peripheral.h
+6 -17
View File
@@ -8,24 +8,16 @@
//! flash region to list available peripherals and control which peripherals are enabled. //! flash region to list available peripherals and control which peripherals are enabled.
enum _peripheral_types enum _peripheral_types
{ {
kPeripheralType_UART = (1 << 0), kPeripheralType_UART = (1 << 0),
kPeripheralType_I2CSlave = (1 << 1), kPeripheralType_I2CSlave = (1 << 1),
kPeripheralType_SPISlave = (1 << 2), kPeripheralType_SPISlave = (1 << 2),
kPeripheralType_CAN = (1 << 3), kPeripheralType_CAN = (1 << 3),
kPeripheralType_USB_HID = (1 << 4), kPeripheralType_USB_HID = (1 << 4),
kPeripheralType_USB_CDC = (1 << 5), kPeripheralType_USB_CDC = (1 << 5),
kPeripheralType_USB_DFU = (1 << 6), kPeripheralType_USB_DFU = (1 << 6),
kPeripheralType_USB_MSC = (1 << 7) kPeripheralType_USB_MSC = (1 << 7),
}; };
//! @brief Pinmux types.
typedef enum _pinmux_types
{
kPinmuxType_Default = 0,
kPinmuxType_GPIO = 1,
kPinmuxType_Peripheral = 2
} pinmux_type_t;
// Forward declaration. // Forward declaration.
typedef struct PeripheralDescriptor peripheral_descriptor_t; typedef struct PeripheralDescriptor peripheral_descriptor_t;
@@ -84,9 +76,6 @@ struct PeripheralDescriptor
//! @brief The instance number of the peripheral. //! @brief The instance number of the peripheral.
uint32_t instance; uint32_t instance;
//! @brief Configure pinmux setting for the peripheral.
void (*pinmuxConfig)(uint32_t instance, pinmux_type_t pinmux);
//! @brief Control interface for the peripheral. //! @brief Control interface for the peripheral.
const peripheral_control_interface_t *controlInterface; const peripheral_control_interface_t *controlInterface;
right/src/buspal/bus_pal_hardware.c
-1
View File
@@ -32,7 +32,6 @@ const peripheral_descriptor_t g_peripherals[] = {
// USB HID - Full speed // USB HID - Full speed
{.typeMask = kPeripheralType_USB_HID, {.typeMask = kPeripheralType_USB_HID,
.instance = 0, .instance = 0,
.pinmuxConfig = NULL,
.controlInterface = &g_usbHidControlInterface, .controlInterface = &g_usbHidControlInterface,
.byteInterface = NULL, .byteInterface = NULL,
.packetInterface = &g_usbHidPacketInterface }, .packetInterface = &g_usbHidPacketInterface },