Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 16:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

STM32 F4 patches from Petteri Aimonen (mostly USB)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5652 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2013-02-15 14:37:37 +00:00
parent 35a73c2f2c
commit d932e56dca
9 changed files with 419 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/arch.h
+26 -12
View File
@@ -81,24 +81,38 @@ extern "C"
* Name: up_initialize
*
* Description:
* up_initialize will be called once during OS
* initialization after the basic OS services have been
* initialized. The architecture specific details of
* initializing the OS will be handled here. Such things as
* setting up interrupt service routines, starting the
* clock, and registering device drivers are some of the
* things that are different for each processor and hardware
* platform.
* up_initialize will be called once during OS initialization after the
* basic OS services have been initialized. The architecture specific
* details of initializing the OS will be handled here. Such things as
* setting up interrupt service routines, starting the clock, and
* registering device drivers are some of the things that are different
* for each processor and hardware platform.
*
* up_initialize is called after the OS initialized but
* before the init process has been started and before the
* libraries have been initialized. OS services and driver
* services are available.
* up_initialize is called after the OS initialized but before the initial
* application has been started and before the libraries have been
* initialized. OS services and driver services are available.
*
****************************************************************************/
void up_initialize(void);
/****************************************************************************
* Name: board_initialize
*
* Description:
* If CONFIG_BOARD_INITIALIZE is selected, then an additional
* initialization call will be performed in the boot-up sequence to a
* function called board_initialize(). board_initialize() will be
* called immediately after up_intiialize() is called and just before the
* initial application is started. This additional initialization phase
* may be used, for example, to initialize board-specific device drivers.
*
****************************************************************************/
#ifdef CONFIG_BOARD_INITIALIZE
void board_initialize(void);
#endif
/****************************************************************************
* Name: up_idle
*
include/nuttx/usb/usbdev_trace.h
+43 -8
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* include/nuttx/usb/usbdev_trace.h
*
* Copyright (C) 2008, 2009-2010, 2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2008, 2009-2010, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -174,6 +174,14 @@
#define TRACE_CLSERROR(id) TRACE_EVENT(TRACE_CLSERROR_ID, id)
/* Event string descriptions ************************************************/
/* Macros for defining the string arrays for display of the traces. */
#ifdef CONFIG_USBDEV_TRACE_STRINGS
# define TRACE_STR(id) {id, #id}
# define TRACE_STR_END {0, NULL}
#endif
/* USB Serial driver class events *******************************************/
/* Used by both the CDC/ACM and the PL2303 serial class drivers */
/* UART interface API calls */
@@ -398,6 +406,18 @@ struct usbtrace_s
uint16_t value;
};
/* Describes on element of a string string for decoding of device-specific
* trace events.
*/
#ifdef CONFIG_USBDEV_TRACE_STRINGS
struct trace_msg_t
{
int id;
const char *str;
};
#endif
/* Enumeration callback function signature */
typedef int (*trace_callback_t)(struct usbtrace_s *trace, void *arg);
@@ -413,17 +433,32 @@ typedef uint16_t usbtrace_idset_t;
typedef int (*trprintf_t)(const char *fmt, ...);
/****************************************************************************
* Public Function Prototypes
* Public Data
****************************************************************************/
#undef EXTERN
#if defined(__cplusplus)
# define EXTERN extern "C"
extern "C" {
extern "C"
{
#else
# define EXTERN extern
#endif
/* If CONFIG_USBDEV_TRACE_STRINGS is defined, then the USB device controller
* driver must provide these strings to support decoding of device-specific
* trace events.
*/
#ifdef CONFIG_USBDEV_TRACE_STRINGS
EXTERN const struct trace_msg_t g_usb_trace_strings_deverror[];
EXTERN const struct trace_msg_t g_usb_trace_strings_intdecode[];
#endif
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
/*******************************************************************************
* Name: usbtrace_enable
*
@@ -443,7 +478,7 @@ extern "C" {
*******************************************************************************/
#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
EXTERN usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset);
usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset);
#else
# define usbtrace_enable(idset)
#endif
@@ -460,7 +495,7 @@ EXTERN usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset);
*******************************************************************************/
#if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB))
EXTERN void usbtrace(uint16_t event, uint16_t value);
void usbtrace(uint16_t event, uint16_t value);
#else
# define usbtrace(event, value)
#endif
@@ -477,7 +512,7 @@ EXTERN void usbtrace(uint16_t event, uint16_t value);
*******************************************************************************/
#ifdef CONFIG_USBDEV_TRACE
EXTERN int usbtrace_enumerate(trace_callback_t callback, void *arg);
int usbtrace_enumerate(trace_callback_t callback, void *arg);
#else
# define usbtrace_enumerate(event)
#endif
@@ -490,7 +525,7 @@ EXTERN int usbtrace_enumerate(trace_callback_t callback, void *arg);
*
*******************************************************************************/
EXTERN void usbtrace_trprintf(trprintf_t trprintf, uint16_t event, uint16_t value);
void usbtrace_trprintf(trprintf_t trprintf, uint16_t event, uint16_t value);
#undef EXTERN
#if defined(__cplusplus)