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

Extract main() to the newly created main.c

Browse Source
This commit is contained in:
László Monda
2016-03-03 10:49:01 +01:00
parent 2c15f1d8c3
commit fc8c0682d6
6 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
right/build/kds/.project
View File

@@ -180,6 +180,11 @@
<type>1</type> <type>1</type>
<locationURI>$%7BPARENT-3-PROJECT_LOC%7D/lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0/osa/usb_osa_bm.h</locationURI> <locationURI>$%7BPARENT-3-PROJECT_LOC%7D/lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0/osa/usb_osa_bm.h</locationURI>
</link> </link>
<link>
<name>sources/main.c</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/main.c</locationURI>
</link>
<link> <link>
<name>sources/usb_composite_device.c</name> <name>sources/usb_composite_device.c</name>
<type>1</type> <type>1</type>

16
right/main.c Normal file
View File

@@ -0,0 +1,16 @@
#include "include/board/clock_config.h"
#include "include/board/board.h"
#include "include/board/pin_mux.h"
#include "usb_composite_device.h"
void main(void)
{
BOARD_InitPins();
BOARD_BootClockHSRUN();
BOARD_InitDebugConsole();
USB_DeviceApplicationInit();
while (1U) {
}
}

15
right/usb_composite_device.c
View File

@@ -10,13 +10,10 @@
#include "usb_interface_mouse.h" #include "usb_interface_mouse.h"
#include "usb_interface_generic_hid.h" #include "usb_interface_generic_hid.h"
#include "fsl_device_registers.h" #include "fsl_device_registers.h"
#include "include/board/clock_config.h"
#include "include/board/board.h"
#include "fsl_debug_console.h" #include "fsl_debug_console.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "fsl_common.h" #include "fsl_common.h"
#include "include/board/pin_mux.h"
#include "usb_descriptor_strings.h" #include "usb_descriptor_strings.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);
@@ -111,7 +108,7 @@ void USB0_IRQHandler(void)
USB_DeviceKhciIsrFunction(UsbCompositeDevice.deviceHandle); USB_DeviceKhciIsrFunction(UsbCompositeDevice.deviceHandle);
} }
static void USB_DeviceApplicationInit(void) void USB_DeviceApplicationInit(void)
{ {
uint8_t usbDeviceKhciIrq[] = USB_IRQS; uint8_t usbDeviceKhciIrq[] = USB_IRQS;
uint8_t irqNumber = usbDeviceKhciIrq[CONTROLLER_ID - kUSB_ControllerKhci0]; uint8_t irqNumber = usbDeviceKhciIrq[CONTROLLER_ID - kUSB_ControllerKhci0];
@@ -131,13 +128,3 @@ static void USB_DeviceApplicationInit(void)
USB_DeviceRun(UsbCompositeDevice.deviceHandle); USB_DeviceRun(UsbCompositeDevice.deviceHandle);
} }
void main(void)
{
BOARD_InitPins();
BOARD_BootClockHSRUN();
BOARD_InitDebugConsole();
USB_DeviceApplicationInit();
while (1U) {
}
}

4
right/usb_composite_device.h
View File

@@ -26,4 +26,8 @@
extern usb_device_composite_struct_t UsbCompositeDevice; extern usb_device_composite_struct_t UsbCompositeDevice;
//Functions:
extern void USB_DeviceApplicationInit(void);
#endif #endif

6
right/usb_interface_keyboard.h
View File

@@ -3,6 +3,12 @@
// Includes: // Includes:
#include "usb_device_config.h"
#include "usb.h"
#include "usb_device.h"
#include "include/usb/usb_device_class.h"
#include "include/usb/usb_device_hid.h"
#include "include/usb/usb_device_ch9.h"
#include "usb_descriptor_keyboard_report.h" #include "usb_descriptor_keyboard_report.h"
// Macros: // Macros:

9
right/usb_interface_mouse.h
View File

@@ -1,6 +1,15 @@
#ifndef __USB_DEVICE_HID_MOUSE_H__ #ifndef __USB_DEVICE_HID_MOUSE_H__
#define __USB_DEVICE_HID_MOUSE_H__ #define __USB_DEVICE_HID_MOUSE_H__
// Includes:
#include "usb_device_config.h"
#include "usb.h"
#include "usb_device.h"
#include "include/usb/usb_device_class.h"
#include "include/usb/usb_device_hid.h"
#include "include/usb/usb_device_ch9.h"
// Macros: // Macros:
#define USB_MOUSE_CLASS (0x03U) #define USB_MOUSE_CLASS (0x03U)