Clean up bus_pal_hardware.[ch]. Add the ENABLE_BUSPAL macro and setup up BusPal if it's 1 instead of the default UHK USB interfaces.

This commit is contained in:
László Monda
2017-04-12 22:58:53 +02:00
parent 4750effd51
commit adc69dcad5
5 changed files with 30 additions and 458 deletions
+2
View File
@@ -5,6 +5,8 @@
// Definitions // Definitions
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define ENABLE_BUSPAL
// //
// Bootloader configuration options // Bootloader configuration options
// //
File diff suppressed because it is too large Load Diff
+5 -51
View File
@@ -1,71 +1,24 @@
#if !defined(__BUS_PAL_HARDWARE_H__) #ifndef __BUS_PAL_HARDWARE_H__
#define __BUS_PAL_HARDWARE_H__ #define __BUS_PAL_HARDWARE_H__
#include "fsl_dspi.h"
#include "fsl_i2c.h" #include "fsl_i2c.h"
#include "bl_peripheral.h" #include "bl_peripheral.h"
uint32_t get_bus_clock(void); typedef struct _i2c_user_config {
/*!
* @brief user config from host for i2c
*/
typedef struct _i2c_user_config
{
uint8_t slaveAddress; uint8_t slaveAddress;
uint16_t baudRate_kbps; uint16_t baudRate_kbps;
} i2c_user_config_t; } i2c_user_config_t;
/*! uint32_t get_bus_clock(void);
* @brief user config from host for spi
*/
typedef struct _dspi_user_config
{
dspi_clock_polarity_t polarity; /*!< Clock polarity */
dspi_clock_phase_t phase; /*!< Clock phase */
dspi_shift_direction_t direction; /*!< MSB or LSB */
uint32_t baudRate_Bps; /*!< Baud Rate for SPI in Hz */
uint32_t clock_Hz;
} dspi_user_config_t;
/*!
* @brief hardware initialization
*/
void init_hardware(void); void init_hardware(void);
//! @brief sending host bytes command process
void write_bytes_to_host(uint8_t *src, uint32_t length); void write_bytes_to_host(uint8_t *src, uint32_t length);
//! @brief receiving host start command process
void host_start_command_rx(uint8_t *dest, uint32_t length); void host_start_command_rx(uint8_t *dest, uint32_t length);
//! @brief receiving host stop command process
void host_stop_command_rx(void); void host_stop_command_rx(void);
//! @brief receiving host get bytes command process
uint32_t get_bytes_received_from_host(void); uint32_t get_bytes_received_from_host(void);
//! @brief i2c config address process
void configure_i2c_address(uint8_t address); void configure_i2c_address(uint8_t address);
//! @brief i2c config speed process
void configure_i2c_speed(uint32_t speedkhz); void configure_i2c_speed(uint32_t speedkhz);
//! @brief i2c sending data process
status_t send_i2c_data(uint8_t *src, uint32_t writeLength); status_t send_i2c_data(uint8_t *src, uint32_t writeLength);
//! @brief i2c receiving data process
status_t receive_i2c_data(uint8_t *dest, uint32_t readLength); status_t receive_i2c_data(uint8_t *dest, uint32_t readLength);
//! @brief GPIO config processing
void configure_gpio(uint8_t port, uint8_t pinNum, uint8_t muxVal);
//! @brief GPIO set up function
void set_gpio(uint8_t port, uint8_t pinNum, uint8_t level);
//! @brief fpga clock set function
void set_fpga_clock(uint32_t clock);
bool usb_hid_poll_for_activity(const peripheral_descriptor_t *self); bool usb_hid_poll_for_activity(const peripheral_descriptor_t *self);
status_t usb_hid_packet_init(const peripheral_descriptor_t *self); status_t usb_hid_packet_init(const peripheral_descriptor_t *self);
status_t usb_hid_packet_read(const peripheral_descriptor_t *self, status_t usb_hid_packet_read(const peripheral_descriptor_t *self,
@@ -76,4 +29,5 @@ status_t usb_hid_packet_write(const peripheral_descriptor_t *self,
const uint8_t *packet, const uint8_t *packet,
uint32_t byteCount, uint32_t byteCount,
packet_type_t packetType); packet_type_t packetType);
#endif // __BUS_PAL_HARDWARE_H__
#endif
+6
View File
@@ -9,6 +9,8 @@
#include "peripherials/test_led.h" #include "peripherials/test_led.h"
#include "usb_interfaces/usb_interface_basic_keyboard.h" #include "usb_interfaces/usb_interface_basic_keyboard.h"
#include "usb_interfaces/usb_interface_media_keyboard.h" #include "usb_interfaces/usb_interface_media_keyboard.h"
#include "bus_pal_hardware.h"
#include "bootloader_config.h"
key_matrix_t KeyMatrix = { key_matrix_t KeyMatrix = {
.colNum = KEYBOARD_MATRIX_COLS_NUM, .colNum = KEYBOARD_MATRIX_COLS_NUM,
@@ -90,7 +92,11 @@ void main() {
InitBridgeProtocolScheduler(); InitBridgeProtocolScheduler();
KeyMatrix_Init(&KeyMatrix); KeyMatrix_Init(&KeyMatrix);
UpdateUsbReports(); UpdateUsbReports();
#ifdef ENABLE_BUSPAL
init_hardware();
#else
InitUsb(); InitUsb();
#endif
// deserialize_Layer(testData, 0); // deserialize_Layer(testData, 0);
+3
View File
@@ -2,6 +2,7 @@
#include "usb_composite_device.h" #include "usb_composite_device.h"
#include "usb_descriptors/usb_descriptor_hid.h" #include "usb_descriptors/usb_descriptor_hid.h"
#include "usb_descriptors/usb_descriptor_strings.h" #include "usb_descriptors/usb_descriptor_strings.h"
#include "bootloader_config.h"
static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param); static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param);
usb_composite_device_t UsbCompositeDevice; usb_composite_device_t UsbCompositeDevice;
@@ -96,10 +97,12 @@ static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event,
return error; return error;
} }
#ifndef ENABLE_BUSPAL
void USB0_IRQHandler() void USB0_IRQHandler()
{ {
USB_DeviceKhciIsrFunction(UsbCompositeDevice.deviceHandle); USB_DeviceKhciIsrFunction(UsbCompositeDevice.deviceHandle);
} }
#endif
void InitUsb() void InitUsb()
{ {