Skip to content

Refactor/usb hal #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
satishgn wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Refactor/usb hal #37

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7cd6207
Moved in usb_xxx files from core-firmware
satishgn Sep 10, 2014
fee0fd5
Renamed usb_xxx.cpp files to usb_xxx.c
satishgn Sep 10, 2014
ff17176
Added usb_xxx files in build.mk
satishgn Sep 10, 2014
7b34bf9
Added USB HAL layer (code moved from main.cpp in core-firmware)
satishgn Sep 10, 2014
5370f3f
Added usb_hal.c to build script
satishgn Sep 10, 2014
fd4d25b
Cleaned up files and fixed build issues
satishgn Sep 10, 2014
1dcc916
Conditionally compile USB : VCP and HID specific HAL APIs
satishgn Sep 10, 2014
a723625
Added SPARK_Platform - moved all vendor provided libraries here
satishgn Sep 11, 2014
5235460
Added STM32F2xx specific driver files (Build scripts addition pending)
satishgn Sep 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleaned up files and fixed build issues
  • Loading branch information
@satishgn
satishgn committed Sep 10, 2014
commit fd4d25b985642037c75a51327448495a8aadbf06
1 change: 1 addition & 0 deletions SPARK_Firmware_Driver/inc/hw_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "config.h"
#include "sst25vf_spi.h"
#include "cc3000_common.h"
#include "usb_type.h"
#include "rgbled.h"
#include "usb_hal.h"

Expand Down
2 changes: 1 addition & 1 deletion SPARK_Firmware_Driver/inc/usb_conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __USB_CONF_H

/* Includes ------------------------------------------------------------------*/
#include "main.h"
#include "usb_hal.h"

/* Exported types ------------------------------------------------------------*/
/* Exported constants --------------------------------------------------------*/
Expand Down
10 changes: 5 additions & 5 deletions SPARK_Firmware_Driver/inc/usb_istr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
/* Exported macro ------------------------------------------------------------*/
/* Exported functions ------------------------------------------------------- */

extern "C" void USB_Istr(void);
void USB_Istr(void);

/* function prototypes Automatically built defining related macros */

#ifdef USB_CDC_ENABLE
extern "C" void EP1_IN_Callback(void);
void EP1_IN_Callback(void);
#endif
#ifdef USB_HID_ENABLE
extern "C" void EP1_IN_Callback(void);
void EP1_IN_Callback(void);
#endif
void EP2_IN_Callback(void);
void EP3_IN_Callback(void);
Expand All @@ -55,7 +55,7 @@ void EP7_IN_Callback(void);
void EP1_OUT_Callback(void);
void EP2_OUT_Callback(void);
#ifdef USB_CDC_ENABLE
extern "C" void EP3_OUT_Callback(void);
void EP3_OUT_Callback(void);
#endif
#ifdef USB_HID_ENABLE
void EP3_OUT_Callback(void);
Expand Down Expand Up @@ -91,7 +91,7 @@ void RESET_Callback(void);

#ifdef SOF_CALLBACK
#ifdef USB_CDC_ENABLE
extern "C" void SOF_Callback(void);
void SOF_Callback(void);
#endif
#endif

Expand Down
2 changes: 0 additions & 2 deletions SPARK_Firmware_Driver/src/usb_desc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@
*/

/* Includes ------------------------------------------------------------------*/
extern "C" {
#include "usb_conf.h"
#include "usb_lib.h"
#include "usb_desc.h"
}

#ifdef USB_CDC_ENABLE
/* USB Standard Device Descriptor */
Expand Down
4 changes: 1 addition & 3 deletions SPARK_Firmware_Driver/src/usb_endp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@
*/

/* Includes ------------------------------------------------------------------*/
#include "main.h"
extern "C" {
#include "usb_hal.h"
#include "usb_lib.h"
#include "usb_desc.h"
#include "usb_mem.h"
#include "usb_istr.h"
#include "usb_pwr.h"
}

/* Private typedef -----------------------------------------------------------*/
/* Private define ------------------------------------------------------------*/
Expand Down
2 changes: 0 additions & 2 deletions SPARK_Firmware_Driver/src/usb_istr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
*/

/* Includes ------------------------------------------------------------------*/
extern "C" {
#include "usb_lib.h"
#include "usb_prop.h"
#include "usb_pwr.h"
#include "usb_istr.h"
}

/* Private typedef -----------------------------------------------------------*/
/* Private define ------------------------------------------------------------*/
Expand Down
4 changes: 1 addition & 3 deletions SPARK_Firmware_Driver/src/usb_prop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,12 @@
*/

/* Includes ------------------------------------------------------------------*/
#include "main.h"
extern "C" {
#include "usb_hal.h"
#include "usb_lib.h"
#include "usb_conf.h"
#include "usb_prop.h"
#include "usb_desc.h"
#include "usb_pwr.h"
}

/* Private typedef -----------------------------------------------------------*/
/* Private define ------------------------------------------------------------*/
Expand Down
1 change: 0 additions & 1 deletion SPARK_Firmware_Driver/src/usb_pwr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
#include "usb_lib.h"
#include "usb_pwr.h"


/* Private typedef -----------------------------------------------------------*/
/* Private define ------------------------------------------------------------*/
/* Private macro -------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion SPARK_Services/inc/usb_hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define __USB_HAL_H

/* Includes ------------------------------------------------------------------*/
#include "usb_type.h"
#include "hw_config.h"

/* Exported types ------------------------------------------------------------*/

Expand Down