jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

First coarse run to fix coding style in locm3.

Browse Source 
Added --terse and --mailback options to the make stylecheck target. It
also does continue even if it enounters a possible error.

We decided on two exceptions from the linux kernel coding standard:
- Empty wait while loops may end with ; on the same line.
- All blocks after while, if, for have to be in brackets even if they
  only contain one statement. Otherwise it is easy to introduce an
  error.

Checkpatch needs to be adapted to reflect those changes.
This commit is contained in:
Piotr Esden-Tempski 2013-06-12 17:44:07 -07:00
parent 48e0f3326b
commit 7df63fcae0
147 changed files with 3323 additions and 2565 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -21,7 +21,7 @@ PREFIX ?= arm-none-eabi
#PREFIX ?= arm-elf #PREFIX ?= arm-elf
STYLECHECK := scripts/checkpatch.pl STYLECHECK := scripts/checkpatch.pl
STYLECHECKFLAGS := --no-tree -f STYLECHECKFLAGS := --no-tree -f --terse --mailback
ifeq ($(DETECT_TOOLCHAIN),) ifeq ($(DETECT_TOOLCHAIN),)
DESTDIR ?= /usr/local DESTDIR ?= /usr/local
@ -102,7 +102,7 @@ clean: cleanheaders
stylecheck: stylecheck:
$(Q)for i in `find . -name '*.[ch]'` ; do \ $(Q)for i in `find . -name '*.[ch]'` ; do \
if ! grep -q "* It was generated by the irq2nvic_h script." $$i ; then \ if ! grep -q "* It was generated by the irq2nvic_h script." $$i ; then \
$(STYLECHECK) $(STYLECHECKFLAGS) $$i || exit $?; \ $(STYLECHECK) $(STYLECHECKFLAGS) $$i; \
fi ; \ fi ; \
done done

35
include/libopencm3/cm3/assert.h
View File

@ -49,25 +49,26 @@ LGPL License Terms @ref lgpl_license
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
#define CM3_LIKELY(expr) (__builtin_expect (!!(expr), 1)) #define CM3_LIKELY(expr) (__builtin_expect(!!(expr), 1))
#ifdef NDEBUG #ifdef NDEBUG
# define cm3_assert(expr) do { (void)0; } while(0) # define cm3_assert(expr) (void)0
# define cm3_assert_not_reached() while(1) # define cm3_assert_not_reached() do { } while (1)
#else #else
# ifdef CM3_ASSERT_VERBOSE # ifdef CM3_ASSERT_VERBOSE
# define cm3_assert(expr) do { \ # define cm3_assert(expr) do { \
if(CM3_LIKELY(expr)) { (void)0; } else { \ if (CM3_LIKELY(expr)) { \
(void)0; \
} else { \
cm3_assert_failed_verbose( \ cm3_assert_failed_verbose( \
__FILE__, __LINE__, \ __FILE__, __LINE__, \
__func__, #expr); \ __func__, #expr); \
} \ } \
} while(0) } while (0)
# define cm3_assert_not_reached() do { \ # define cm3_assert_not_reached() \
cm3_assert_failed_verbose( \ cm3_assert_failed_verbose( \
__FILE__, __LINE__, \ __FILE__, __LINE__, \
__func__, 0); \ __func__, 0)
} while(0)
# else # else
/** @brief Check if assertion is true. /** @brief Check if assertion is true.
* *
@ -82,10 +83,12 @@ LGPL License Terms @ref lgpl_license
* *
* @param expr expression to check */ * @param expr expression to check */
# define cm3_assert(expr) do { \ # define cm3_assert(expr) do { \
if(CM3_LIKELY(expr)) { (void)0; } else { \ if (CM3_LIKELY(expr)) { \
(void)0; \
} else { \
cm3_assert_failed(); \ cm3_assert_failed(); \
} \ } \
} while(0) } while (0)
/** @brief Check if unreachable code is reached. /** @brief Check if unreachable code is reached.
* *
* If NDEBUG macro is defined, this macro generates code for an infinite loop. * If NDEBUG macro is defined, this macro generates code for an infinite loop.
@ -95,9 +98,7 @@ LGPL License Terms @ref lgpl_license
* The purpose of this macro is to aid in debugging libopencm3 and * The purpose of this macro is to aid in debugging libopencm3 and
* applications using it. It can be used for example to stop execution if an * applications using it. It can be used for example to stop execution if an
* unreachable portion of code is reached. */ * unreachable portion of code is reached. */
# define cm3_assert_not_reached() do { \ # define cm3_assert_not_reached() cm3_assert_failed()
cm3_assert_failed(); \
} while(0)
# endif # endif
#endif #endif
@ -111,7 +112,7 @@ BEGIN_DECLS
* implementation. Usually, a custom implementation of this function should * implementation. Usually, a custom implementation of this function should
* report an error in some way (print a message to a debug console, display, * report an error in some way (print a message to a debug console, display,
* LED, ...) and halt execution or reboot the device. */ * LED, ...) and halt execution or reboot the device. */
void cm3_assert_failed(void) __attribute__ ((__noreturn__)); void cm3_assert_failed(void) __attribute__((__noreturn__));
/** @brief Called on a failed assertion with verbose messages enabled. /** @brief Called on a failed assertion with verbose messages enabled.
* *
@ -127,7 +128,7 @@ void cm3_assert_failed(void) __attribute__ ((__noreturn__));
* @param func Name of the function where the failed assertion occurred * @param func Name of the function where the failed assertion occurred
* @param assert_expr Expression that evaluated to false (can be NULL) */ * @param assert_expr Expression that evaluated to false (can be NULL) */
void cm3_assert_failed_verbose(const char *file, int line, const char *func, void cm3_assert_failed_verbose(const char *file, int line, const char *func,
const char *assert_expr) __attribute__ ((__noreturn__)); const char *assert_expr) __attribute__((__noreturn__));
END_DECLS END_DECLS

7
include/libopencm3/cm3/common.h
View File

@ -46,9 +46,9 @@ typedef uint64_t u64;
#ifdef __GNUC__ #ifdef __GNUC__
# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 4) # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 4)
# define LIBOPENCM3_DEPRECATED(x) __attribute__ ((deprecated (x))) # define LIBOPENCM3_DEPRECATED(x) __attribute__((deprecated(x)))
# else # else
# define LIBOPENCM3_DEPRECATED(x) __attribute__ ((deprecated)) # define LIBOPENCM3_DEPRECATED(x) __attribute__((deprecated))
# endif # endif
#else #else
# define LIBOPENCM3_DEPRECATED(x) # define LIBOPENCM3_DEPRECATED(x)
@ -95,4 +95,7 @@ typedef uint64_t u64;
#define BIT30 (1<<30) #define BIT30 (1<<30)
#define BIT31 (1<<31) #define BIT31 (1<<31)
#define __packed __attribute__((packed))
#define __aligned(x) __attribute__((aligned(x)))
#endif #endif

22
include/libopencm3/cm3/nvic.h
View File

@ -44,37 +44,43 @@ LGPL License Terms @ref lgpl_license
/* ISER: Interrupt Set Enable Registers */ /* ISER: Interrupt Set Enable Registers */
/* Note: 8 32bit Registers */ /* Note: 8 32bit Registers */
#define NVIC_ISER(iser_id) MMIO32(NVIC_BASE + 0x00 + (iser_id * 4)) #define NVIC_ISER(iser_id) MMIO32(NVIC_BASE + 0x00 + \
(iser_id * 4))
/* NVIC_BASE + 0x020 (0xE000 E120 - 0xE000 E17F): Reserved */ /* NVIC_BASE + 0x020 (0xE000 E120 - 0xE000 E17F): Reserved */
/* ICER: Interrupt Clear Enable Registers */ /* ICER: Interrupt Clear Enable Registers */
/* Note: 8 32bit Registers */ /* Note: 8 32bit Registers */
#define NVIC_ICER(icer_id) MMIO32(NVIC_BASE + 0x80 + (icer_id * 4)) #define NVIC_ICER(icer_id) MMIO32(NVIC_BASE + 0x80 + \
(icer_id * 4))
/* NVIC_BASE + 0x0A0 (0xE000 E1A0 - 0xE000 E1FF): Reserved */ /* NVIC_BASE + 0x0A0 (0xE000 E1A0 - 0xE000 E1FF): Reserved */
/* ISPR: Interrupt Set Pending Registers */ /* ISPR: Interrupt Set Pending Registers */
/* Note: 8 32bit Registers */ /* Note: 8 32bit Registers */
#define NVIC_ISPR(ispr_id) MMIO32(NVIC_BASE + 0x100 + (ispr_id * 4)) #define NVIC_ISPR(ispr_id) MMIO32(NVIC_BASE + 0x100 + \
(ispr_id * 4))
/* NVIC_BASE + 0x120 (0xE000 E220 - 0xE000 E27F): Reserved */ /* NVIC_BASE + 0x120 (0xE000 E220 - 0xE000 E27F): Reserved */
/* ICPR: Interrupt Clear Pending Registers */ /* ICPR: Interrupt Clear Pending Registers */
/* Note: 8 32bit Registers */ /* Note: 8 32bit Registers */
#define NVIC_ICPR(icpr_id) MMIO32(NVIC_BASE + 0x180 + (icpr_id * 4)) #define NVIC_ICPR(icpr_id) MMIO32(NVIC_BASE + 0x180 + \
(icpr_id * 4))
/* NVIC_BASE + 0x1A0 (0xE000 E2A0 - 0xE00 E2FF): Reserved */ /* NVIC_BASE + 0x1A0 (0xE000 E2A0 - 0xE00 E2FF): Reserved */
/* IABR: Interrupt Active Bit Register */ /* IABR: Interrupt Active Bit Register */
/* Note: 8 32bit Registers */ /* Note: 8 32bit Registers */
#define NVIC_IABR(iabr_id) MMIO32(NVIC_BASE + 0x200 + (iabr_id * 4)) #define NVIC_IABR(iabr_id) MMIO32(NVIC_BASE + 0x200 + \
(iabr_id * 4))
/* NVIC_BASE + 0x220 (0xE000 E320 - 0xE000 E3FF): Reserved */ /* NVIC_BASE + 0x220 (0xE000 E320 - 0xE000 E3FF): Reserved */
/* IPR: Interrupt Priority Registers */ /* IPR: Interrupt Priority Registers */
/* Note: 240 8bit Registers */ /* Note: 240 8bit Registers */
#define NVIC_IPR(ipr_id) MMIO8(NVIC_BASE + 0x300 + ipr_id) #define NVIC_IPR(ipr_id) MMIO8(NVIC_BASE + 0x300 + \
ipr_id)
/* STIR: Software Trigger Interrupt Register */ /* STIR: Software Trigger Interrupt Register */
#define NVIC_STIR MMIO32(STIR_BASE) #define NVIC_STIR MMIO32(STIR_BASE)
@ -104,12 +110,12 @@ IRQ numbers -3 and -6 to -9 are reserved
* specific header file in the corresponding subfolder. * specific header file in the corresponding subfolder.
*/ */
#define WEAK __attribute__((weak))
#include <libopencm3/dispatch/nvic.h> #include <libopencm3/dispatch/nvic.h>
/* --- NVIC functions ------------------------------------------------------ */ /* --- NVIC functions ------------------------------------------------------ */
#define WEAK __attribute__ ((weak))
BEGIN_DECLS BEGIN_DECLS
void nvic_enable_irq(u8 irqn); void nvic_enable_irq(u8 irqn);

2
include/libopencm3/cm3/scb.h
View File

@ -374,7 +374,7 @@ struct scb_exception_stack_frame {
u32 lr; u32 lr;
u32 pc; u32 pc;
u32 xpsr; u32 xpsr;
} __attribute__((packed)); } __packed;
#define SCB_GET_EXCEPTION_STACK_FRAME(f) \ #define SCB_GET_EXCEPTION_STACK_FRAME(f) \
do { \ do { \

185
include/libopencm3/cm3/scs.h
View File

@ -21,15 +21,17 @@
#ifndef LIBOPENCM3_CM3_SCS_H #ifndef LIBOPENCM3_CM3_SCS_H
#define LIBOPENCM3_CM3_SCS_H #define LIBOPENCM3_CM3_SCS_H
/* /*
* All the definition hereafter are generic for CortexMx ARMv7-M * All the definition hereafter are generic for CortexMx ARMv7-M
* See ARM document "ARMv7-M Architecture Reference Manual" for more details. * See ARM document "ARMv7-M Architecture Reference Manual" for more details.
* See also ARM document "ARM Compiler toolchain Developing Software for ARM Processors" for details on System Timer/SysTick. * See also ARM document "ARM Compiler toolchain Developing Software for ARM
* Processors" for details on System Timer/SysTick.
*/ */
/* /*
* The System Control Space (SCS) is a memory-mapped 4KB address space that provides 32-bit registers for * The System Control Space (SCS) is a memory-mapped 4KB address space that
* configuration, status reporting and control. The SCS registers divide into the following groups: * provides 32-bit registers for configuration, status reporting and control.
* The SCS registers divide into the following groups:
* - system control and identification * - system control and identification
* - the CPUID processor identification space * - the CPUID processor identification space
* - system configuration and status * - system configuration and status
@ -46,25 +48,27 @@
/* /*
* Debug Halting Control and Status Register (DHCSR). * Debug Halting Control and Status Register (DHCSR).
* *
* Purpose Controls halting debug. * Purpose Controls halting debug.
* Usage constraints: The effect of modifying the C_STEP or C_MASKINTS bit when the system * Usage constraints: The effect of modifying the C_STEP or C_MASKINTS bit when
* is running with halting debug enabled is UNPREDICTABLE. * the system is running with halting debug enabled is UNPREDICTABLE.
* Halting debug is enabled when C_DEBUGEN is set to 1. The system is running when S_HALT is set to 0. * Halting debug is enabled when C_DEBUGEN is set to 1. The system is running
* - When C_DEBUGEN is set to 0, the processor ignores the values of all other bits in this register. * when S_HALT is set to 0.
* - For more information about the use of DHCSR see Debug stepping on * - When C_DEBUGEN is set to 0, the processor ignores the values of all other
* page C1-824. * bits in this register.
* - For more information about the use of DHCSR see Debug stepping on page
* C1-824.
* Configurations Always implemented. * Configurations Always implemented.
*/ */
/* SCS_DHCSR register */ /* SCS_DHCSR register */
#define SCS_DHCSR MMIO32(SCS_BASE + 0xDF0) #define SCS_DHCSR MMIO32(SCS_BASE + 0xDF0)
/* /*
* Debug Core Register Selector Register (DCRSR). * Debug Core Register Selector Register (DCRSR).
* *
* Purpose With the DCRDR, the DCRSR provides debug access to the ARM core registers, * Purpose With the DCRDR, the DCRSR provides debug access to the ARM core
* special-purpose registers, and Floating-point extension registers. A write to DCRSR * registers, special-purpose registers, and Floating-point extension
* specifies the register to transfer, whether the transfer is a read or a write, and starts * registers. A write to DCRSR specifies the register to transfer, whether the
* the transfer. * transfer is a read or a write, and starts the transfer.
* Usage constraints: Only accessible in Debug state. * Usage constraints: Only accessible in Debug state.
* Configurations Always implemented. * Configurations Always implemented.
* *
@ -73,15 +77,16 @@
#define SCS_DCRSR MMIO32(SCS_BASE + 0xDF4) #define SCS_DCRSR MMIO32(SCS_BASE + 0xDF4)
/* /*
* Debug Core Register Data Register (DCRDR) * Debug Core Register Data Register (DCRDR)
* *
* Purpose With the DCRSR, see Debug Core Register Selector Register, * Purpose With the DCRSR, see Debug Core Register Selector Register, the DCRDR
* the DCRDR provides debug access to the ARM core registers, * provides debug access to the ARM core registers, special-purpose registers,
* special-purpose registers, and Floating-point extension registers. The * and Floating-point extension registers. The DCRDR is the data register for
* DCRDR is the data register for these accesses. * these accesses.
* - Used on its own, the DCRDR provides a message passing resource between * - Used on its own, the DCRDR provides a message passing resource between an
* an external debugger and a debug agent running on the processor. * external debugger and a debug agent running on the processor.
* Note: * Note:
* The architecture does not define any handshaking mechanism for this use of DCRDR. * The architecture does not define any handshaking mechanism for this use of
* DCRDR.
* Usage constraints: See Use of DCRSR and DCRDR for constraints that apply to * Usage constraints: See Use of DCRSR and DCRDR for constraints that apply to
* particular transfers using the DCRSR and DCRDR. * particular transfers using the DCRSR and DCRDR.
* Configurations Always implemented. * Configurations Always implemented.
@ -92,12 +97,13 @@
/* /*
* Debug Exception and Monitor Control Register (DEMCR). * Debug Exception and Monitor Control Register (DEMCR).
* *
* Purpose Manages vector catch behavior and DebugMonitor handling when debugging. * Purpose Manages vector catch behavior and DebugMonitor handling when
* debugging.
* Usage constraints: * Usage constraints:
* - Bits [23:16] provide DebugMonitor exception control. * - Bits [23:16] provide DebugMonitor exception control.
* - Bits [15:0] provide Debug state, halting debug, control. * - Bits [15:0] provide Debug state, halting debug, control.
* Configurations Always implemented. * Configurations Always implemented.
* *
*/ */
/* SCS_DEMCR register */ /* SCS_DEMCR register */
#define SCS_DEMCR MMIO32(SCS_BASE + 0xDFC) #define SCS_DEMCR MMIO32(SCS_BASE + 0xDFC)
@ -143,20 +149,22 @@
/* /*
* System Control Space (SCS) => System timer register support in the SCS. * System Control Space (SCS) => System timer register support in the SCS.
* To configure SysTick, load the interval required between SysTick events to the SysTick Reload * To configure SysTick, load the interval required between SysTick events to
* Value register. The timer interrupt, or COUNTFLAG bit in the SysTick Control and Status * the SysTick Reload Value register. The timer interrupt, or COUNTFLAG bit in
* register, is activated on the transition from 1 to 0, therefore it activates every n+1 clock ticks. * the SysTick Control and Status register, is activated on the transition from
* If you require a period of 100, write 99 to the SysTick Reload Value register. The SysTick Reload * 1 to 0, therefore it activates every n+1 clock ticks. If you require a
* Value register supports values between 0x1 and 0x00FFFFFF. * period of 100, write 99 to the SysTick Reload Value register. The SysTick
* Reload Value register supports values between 0x1 and 0x00FFFFFF.
* *
* If you want to use SysTick to generate an event at a timed interval, for example 1ms, you can * If you want to use SysTick to generate an event at a timed interval, for
* use the SysTick Calibration Value Register to scale your value for the Reload register. The * example 1ms, you can use the SysTick Calibration Value Register to scale
* SysTick Calibration Value Register is a read-only register that contains the number of pulses for * your value for the Reload register. The SysTick Calibration Value Register
* a period of 10ms, in the TENMS field, bits[23:0]. * is a read-only register that contains the number of pulses for a period of
* 10ms, in the TENMS field, bits[23:0].
* *
* This register also has a SKEW bit. Bit[30] == 1 indicates that the calibration for 10ms in the * This register also has a SKEW bit. Bit[30] == 1 indicates that the
* TENMS section is not exactly 10ms due to clock frequency. Bit[31] == 1 indicates that the * calibration for 10ms in the TENMS section is not exactly 10ms due to clock
* reference clock is not provided. * frequency. Bit[31] == 1 indicates that the reference clock is not provided.
*/ */
/* /*
* SysTick Control and Status Register (CSR). * SysTick Control and Status Register (CSR).
@ -176,14 +184,14 @@
*/ */
#define CM_SCS_SYST_RVR MMIO32(SCS_BASE + 0x14) #define CM_SCS_SYST_RVR MMIO32(SCS_BASE + 0x14)
/* SysTick Current Value Register (RVR). /* SysTick Current Value Register (RVR).
* Purpose Holds the reload value of the SYST_CVR. * Purpose Holds the reload value of the SYST_CVR.
* Usage constraints There are no usage constraints. * Usage constraints There are no usage constraints.
* Configurations Always implemented. * Configurations Always implemented.
*/ */
#define CM_SCS_SYST_CVR MMIO32(SCS_BASE + 0x18) #define CM_SCS_SYST_CVR MMIO32(SCS_BASE + 0x18)
/* /*
* SysTick Calibration value Register(Read Only) (CALIB) * SysTick Calibration value Register(Read Only) (CALIB)
* Purpose Reads the calibration value and parameters for SysTick. * Purpose Reads the calibration value and parameters for SysTick.
* Usage constraints: There are no usage constraints. * Usage constraints: There are no usage constraints.
@ -198,72 +206,86 @@
#define SCS_SYST_CSR_TICKINT (BIT1) #define SCS_SYST_CSR_TICKINT (BIT1)
/* SysTick uses the processor clock. */ /* SysTick uses the processor clock. */
#define SCS_SYST_CSR_CLKSOURCE (BIT2) #define SCS_SYST_CSR_CLKSOURCE (BIT2)
/* /*
* Indicates whether the counter has counted to 0 since the last read of this register: * Indicates whether the counter has counted to 0 since the last read of this
* register:
* 0 = Timer has not counted to 0 * 0 = Timer has not counted to 0
* 1 = Timer has counted to 0. * 1 = Timer has counted to 0.
*/ */
#define SCS_SYST_CSR_COUNTFLAG (BIT16) #define SCS_SYST_CSR_COUNTFLAG (BIT16)
/* --- CM_SCS_SYST_RVR values ----------------------------------------------- */ /* --- CM_SCS_SYST_RVR values ---------------------------------------------- */
/* Bit 0 to 23 => RELOAD The value to load into the SYST_CVR when the counter reaches 0. */ /* Bit 0 to 23 => RELOAD The value to load into the SYST_CVR when the counter
* reaches 0.
*/
/* Bit 24 to 31 are Reserved */ /* Bit 24 to 31 are Reserved */
/* --- CM_SCS_SYST_CVR values ----------------------------------------------- */ /* --- CM_SCS_SYST_CVR values ---------------------------------------------- */
/* Bit0 to 31 => Reads or clears the current counter value. */ /* Bit0 to 31 => Reads or clears the current counter value. */
/* --- CM_SCS_SYST_CALIB values ----------------------------------------------- */ /* --- CM_SCS_SYST_CALIB values -------------------------------------------- */
/* /*
* Bit0 to 23 => TENMS Optionally, holds a reload value to be used for 10ms (100Hz) timing, subject to system clock * Bit0 to 23 => TENMS Optionally, holds a reload value to be used for 10ms
* skew errors. If this field is zero, the calibration value is not known. * (100Hz) timing, subject to system clock skew errors. If this field is zero,
* the calibration value is not known.
*/ */
#define SCS_SYST_SYST_CALIB_TENMS_MASK (BIT24-1) #define SCS_SYST_SYST_CALIB_TENMS_MASK (BIT24-1)
/* /*
* Bit30 => SKEW Indicates whether the 10ms calibration value is exact: * Bit30 => SKEW Indicates whether the 10ms calibration value is exact:
* 0 = 10ms calibration value is exact. * 0 = 10ms calibration value is exact.
* 1 = 10ms calibration value is inexact, because of the clock frequency * 1 = 10ms calibration value is inexact, because of the clock frequency
*/ */
#define SCS_SYST_SYST_CALIB_VALUE_INEXACT (BIT30) #define SCS_SYST_SYST_CALIB_VALUE_INEXACT (BIT30)
/* /*
* Bit31 => NOREF Indicates whether the IMPLEMENTATION DEFINED reference clock is implemented: * Bit31 => NOREF Indicates whether the IMPLEMENTATION DEFINED reference clock
* is implemented:
* 0 = The reference clock is implemented. * 0 = The reference clock is implemented.
* 1 = The reference clock is not implemented. * 1 = The reference clock is not implemented.
* When this bit is 1, the CLKSOURCE bit of the SYST_CSR register is forced to 1 and cannot * When this bit is 1, the CLKSOURCE bit of the SYST_CSR register is forced to
* be cleared to 0. * 1 and cannot be cleared to 0.
*/ */
#define SCS_SYST_SYST_CALIB_REF_NOT_IMPLEMENTED (BIT31) #define SCS_SYST_SYST_CALIB_REF_NOT_IMPLEMENTED (BIT31)
/* /*
* System Control Space (SCS) => Data Watchpoint and Trace (DWT). * System Control Space (SCS) => Data Watchpoint and Trace (DWT).
* See http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0403c/index.html (ARMv7-M Architecture Reference Manual) * See http://goo.gl/mZm30 (ARMv7-M Architecture Reference Manual)
* The DWT is an optional debug unit that provides watchpoints, data tracing, and system profiling * The DWT is an optional debug unit that provides watchpoints, data tracing,
* for the processor. * and system profiling for the processor.
*/ */
/* /*
* DWT Control register * DWT Control register
* Purpose Provides configuration and status information for the DWT block, and used to control features of the block * Purpose Provides configuration and status information for the DWT block, and
* used to control features of the block
* Usage constraints: There are no usage constraints. * Usage constraints: There are no usage constraints.
* Configurations Always implemented. * Configurations Always implemented.
*/ */
#define SCS_DWT_CTRL MMIO32(DWT_BASE + 0x00) #define SCS_DWT_CTRL MMIO32(DWT_BASE + 0x00)
/* /*
* DWT_CYCCNT register * DWT_CYCCNT register
* Cycle Count Register (Shows or sets the value of the processor cycle counter, CYCCNT) * Cycle Count Register (Shows or sets the value of the processor cycle
* When enabled, CYCCNT increments on each processor clock cycle. On overflow, CYCCNT wraps to zero. * counter, CYCCNT)
* When enabled, CYCCNT increments on each processor clock cycle. On overflow,
* CYCCNT wraps to zero.
* *
* Purpose Shows or sets the value of the processor cycle counter, CYCCNT. * Purpose Shows or sets the value of the processor cycle counter, CYCCNT.
* Usage constraints: The DWT unit suspends CYCCNT counting when the processor is in Debug state. * Usage constraints: The DWT unit suspends CYCCNT counting when the processor
* Configurations Implemented: only when DWT_CTRL.NOCYCCNT is RAZ, see Control register, DWT_CTRL. * is in Debug state.
* When DWT_CTRL.NOCYCCNT is RAO no cycle counter is implemented and this register is UNK/SBZP. * Configurations Implemented: only when DWT_CTRL.NOCYCCNT is RAZ, see Control
* register, DWT_CTRL.
* When DWT_CTRL.NOCYCCNT is RAO no cycle counter is implemented and this
* register is UNK/SBZP.
*/ */
#define SCS_DWT_CYCCNT MMIO32(DWT_BASE + 0x04) #define SCS_DWT_CYCCNT MMIO32(DWT_BASE + 0x04)
/* DWT_CPICNT register /* DWT_CPICNT register
* Purpose Counts additional cycles required to execute multi-cycle instructions and instruction fetch stalls. * Purpose Counts additional cycles required to execute multi-cycle
* Usage constraints: The counter initializes to 0 when software enables its counter overflow event by * instructions and instruction fetch stalls.
* Usage constraints: The counter initializes to 0 when software enables its
* counter overflow event by
* setting the DWT_CTRL.CPIEVTENA bit to 1. * setting the DWT_CTRL.CPIEVTENA bit to 1.
* Configurations Implemented: only when DWT_CTRL.NOPRFCNT is RAZ, see Control register, DWT_CTRL. * Configurations Implemented: only when DWT_CTRL.NOPRFCNT is RAZ, see Control
* register, DWT_CTRL.
* If DWT_CTRL.NOPRFCNT is RAO, indicating that the implementation does not * If DWT_CTRL.NOPRFCNT is RAO, indicating that the implementation does not
* include the profiling counters, this register is UNK/SBZP. * include the profiling counters, this register is UNK/SBZP.
*/ */
@ -284,8 +306,8 @@
/* DWT_PCSR register */ /* DWT_PCSR register */
#define SCS_DWT_PCSR MMIO32(DWT_BASE + 0x18) #define SCS_DWT_PCSR MMIO32(DWT_BASE + 0x18)
/* --- SCS_DWT_CTRL values ----------------------------------------------- */ /* --- SCS_DWT_CTRL values ------------------------------------------------- */
/* /*
* Enables CYCCNT: * Enables CYCCNT:
* 0 = Disabled, 1 = Enabled * 0 = Disabled, 1 = Enabled
* This bit is UNK/SBZP if the NOCYCCNT bit is RAO. * This bit is UNK/SBZP if the NOCYCCNT bit is RAO.
@ -295,15 +317,20 @@
/* TODO bit definition values for other DWT_XXX register */ /* TODO bit definition values for other DWT_XXX register */
/* Macro to be called at startup to enable SCS & Cycle Counter */ /* Macro to be called at startup to enable SCS & Cycle Counter */
#define SCS_DWT_CYCLE_COUNTER_ENABLED() ( (SCS_DEMCR |= SCS_DEMCR_TRCENA)\ #define SCS_DWT_CYCLE_COUNTER_ENABLED() ((SCS_DEMCR |= SCS_DEMCR_TRCENA)\
(SCS_DWT_CTRL |= SCS_DWT_CTRL_CYCCNTENA) ) (SCS_DWT_CTRL |= SCS_DWT_CTRL_CYCCNTENA))
#define SCS_SYSTICK_DISABLED() (SCS_SYST_CSR=0) #define SCS_SYSTICK_DISABLED() (SCS_SYST_CSR = 0)
/* Macro to be called at startup to Enable CortexMx SysTick (but IRQ not enabled) */ /* Macro to be called at startup to Enable CortexMx SysTick (but IRQ not
#define SCS_SYSTICK_ENABLED() (SCS_SYST_CSR=(SCS_SYST_CSR_ENABLE | SCS_SYST_CSR_CLKSOURCE)) * enabled)
*/
#define SCS_SYSTICK_ENABLED() (SCS_SYST_CSR = (SCS_SYST_CSR_ENABLE | \
SCS_SYST_CSR_CLKSOURCE))
/* Macro to be called at startup to Enable CortexMx SysTick and IRQ */ /* Macro to be called at startup to Enable CortexMx SysTick and IRQ */
#define SCS_SYSTICK_AND_IRQ_ENABLED() (SCS_SYST_CSR=(SCS_SYST_CSR_ENABLE | SCS_SYST_CSR_CLKSOURCE | SCS_SYST_CSR_TICKINT)) #define SCS_SYSTICK_AND_IRQ_ENABLED() (SCS_SYST_CSR = (SCS_SYST_CSR_ENABLE | \
SCS_SYST_CSR_CLKSOURCE | \
SCS_SYST_CSR_TICKINT))
#endif #endif

8
include/libopencm3/cm3/sync.h
View File

@ -29,8 +29,8 @@
/* --- Exclusive load and store instructions ------------------------------- */ /* --- Exclusive load and store instructions ------------------------------- */
u32 __ldrex(volatile u32* addr); u32 __ldrex(volatile u32 *addr);
u32 __strex(u32 val, volatile u32* addr); u32 __strex(u32 val, volatile u32 *addr);
void __dmb(void); void __dmb(void);
/* --- Convenience functions ----------------------------------------------- */ /* --- Convenience functions ----------------------------------------------- */
@ -42,7 +42,7 @@ typedef u32 mutex_t;
#define MUTEX_UNLOCKED 0 #define MUTEX_UNLOCKED 0
#define MUTEX_LOCKED 1 #define MUTEX_LOCKED 1
void mutex_lock(mutex_t* m); void mutex_lock(mutex_t *m);
void mutex_unlock(mutex_t* m); void mutex_unlock(mutex_t *m);
#endif #endif

4
include/libopencm3/cm3/tpiu.h
View File

@ -53,14 +53,14 @@
* bit[N] == 0, trace port width of (N+1) not supported * bit[N] == 0, trace port width of (N+1) not supported
* bit[N] == 1, trace port width of (N+1) supported * bit[N] == 1, trace port width of (N+1) supported
*/ */
#define TPIU_SSPSR_BYTE (1 << 0) #define TPIU_SSPSR_BYTE (1 << 0)
#define TPIU_SSPSR_HALFWORD (1 << 1) #define TPIU_SSPSR_HALFWORD (1 << 1)
#define TPIU_SSPSR_WORD (1 << 3) #define TPIU_SSPSR_WORD (1 << 3)
/* --- TPIU_SSPSR values --------------------------------------------------- */ /* --- TPIU_SSPSR values --------------------------------------------------- */
/* Same format as TPIU_SSPSR, except only one is set */ /* Same format as TPIU_SSPSR, except only one is set */
#define TPIU_CSPSR_BYTE (1 << 0) #define TPIU_CSPSR_BYTE (1 << 0)
#define TPIU_CSPSR_HALFWORD (1 << 1) #define TPIU_CSPSR_HALFWORD (1 << 1)
#define TPIU_CSPSR_WORD (1 << 3) #define TPIU_CSPSR_WORD (1 << 3)

2
include/libopencm3/cm3/vector.h
View File

@ -45,7 +45,7 @@
typedef void (*vector_table_entry_t)(void); typedef void (*vector_table_entry_t)(void);
typedef struct { typedef struct {
unsigned int *initial_sp_value; /**< The value the stack pointer is set to initially */ unsigned int *initial_sp_value; /**< Initial stack pointer value. */
vector_table_entry_t reset; vector_table_entry_t reset;
vector_table_entry_t nmi; vector_table_entry_t nmi;
vector_table_entry_t hard_fault; vector_table_entry_t hard_fault;

3
include/libopencm3/lm3s/gpio.h
View File

@ -6,7 +6,8 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2011 Gareth McMullin <gareth@blacksphere.co.nz> @author @htmlonly &copy; @endhtmlonly 2011
Gareth McMullin <gareth@blacksphere.co.nz>
@date 10 March 2013 @date 10 March 2013

3
include/libopencm3/lm3s/systemcontrol.h
View File

@ -6,7 +6,8 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2011 Gareth McMullin <gareth@blacksphere.co.nz> @author @htmlonly &copy; @endhtmlonly 2011
Gareth McMullin <gareth@blacksphere.co.nz>
@date 10 March 2013 @date 10 March 2013

6
include/libopencm3/lm4f/gpio.h
View File

@ -6,8 +6,10 @@
* *
* @version 1.0.0 * @version 1.0.0
* *
* @author @htmlonly &copy; @endhtmlonly 2011 Gareth McMullin <gareth@blacksphere.co.nz> * @author @htmlonly &copy; @endhtmlonly 2011
* @author @htmlonly &copy; @endhtmlonly 2013 Alexandru Gagniuc <mr.nuke.me@gmail.com> * Gareth McMullin <gareth@blacksphere.co.nz>
* @author @htmlonly &copy; @endhtmlonly 2013
* Alexandru Gagniuc <mr.nuke.me@gmail.com>
* *
* @date 16 March 2013 * @date 16 March 2013
* *

12
include/libopencm3/lm4f/nvic.h
View File

@ -1,12 +1,14 @@
/** @defgroup nvic_defines Nested Vectored Interrupt Controller /** @defgroup nvic_defines Nested Vectored Interrupt Controller
@brief <b>Defined Constants and Types for the LM4F Nested Vectored Interrupt Controller</b> @brief <b>Defined Constants and Types for the LM4F Nested Vectored Interrupt
Controller</b>
@ingroup LM4Fxx_defines @ingroup LM4Fxx_defines
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com> @author @htmlonly &copy; @endhtmlonly 2012
Alexandru Gagniuc <mr.nuke.me@gmail.com>
@date 10 March 2013 @date 10 March 2013
@ -40,9 +42,9 @@ LGPL License Terms @ref lgpl_license
#include <libopencm3/cm3/nvic.h> #include <libopencm3/cm3/nvic.h>
/** @ingroup nvic_defines /** @ingroup nvic_defines
* The LM3S interrupt table applies to the LM4F as well. * The LM3S interrupt table applies to the LM4F as well. Some interrupt
* Some interrupt vectors marked as reserved in LM3S are used in LM4F, and some * vectors marked as reserved in LM3S are used in LM4F, and some vectors in
* vectors in LM3S are marked reserved for LM4F. However, the common vectors are * LM3S are marked reserved for LM4F. However, the common vectors are
* identical, and we can safely use the same interrupt table. Reserved vectors * identical, and we can safely use the same interrupt table. Reserved vectors
* will never be triggered, so having them is perfectly safe. * will never be triggered, so having them is perfectly safe.
*/ */

3
include/libopencm3/lm4f/rcc.h
View File

@ -6,7 +6,8 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com> @author @htmlonly &copy; @endhtmlonly 2012
Alexandru Gagniuc <mr.nuke.me@gmail.com>
@date 10 March 2013 @date 10 March 2013

9
include/libopencm3/lm4f/systemcontrol.h
View File

@ -6,7 +6,8 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com> @author @htmlonly &copy; @endhtmlonly 2012
Alexandru Gagniuc <mr.nuke.me@gmail.com>
@date 10 March 2013 @date 10 March 2013
@ -726,9 +727,9 @@ typedef enum {
} clken_t; } clken_t;
/* ============================================================================= /* ============================================================================
* Function prototypes * Function prototypes
* ---------------------------------------------------------------------------*/ * --------------------------------------------------------------------------*/
BEGIN_DECLS BEGIN_DECLS
void periph_clock_enable(clken_t periph); void periph_clock_enable(clken_t periph);
@ -740,5 +741,3 @@ END_DECLS
#endif /* LM4F_SYSTEMCONTROL_H */ #endif /* LM4F_SYSTEMCONTROL_H */

15
include/libopencm3/lm4f/uart.h
View File

@ -6,7 +6,8 @@
* *
* @version 1.0.0 * @version 1.0.0
* *
* @author @htmlonly &copy; @endhtmlonly 2013 Alexandru Gagniuc <mr.nuke.me@gmail.com> * @author @htmlonly &copy; @endhtmlonly 2013
* Alexandru Gagniuc <mr.nuke.me@gmail.com>
* *
* @date 07 May 2013 * @date 07 May 2013
* *
@ -479,7 +480,8 @@ void uart_set_fifo_trigger_levels(u32 uart,
* @param[in] uart UART block register address base @ref uart_reg_base * @param[in] uart UART block register address base @ref uart_reg_base
*/ */
static inline static inline
bool uart_is_tx_fifo_full(u32 uart) { bool uart_is_tx_fifo_full(u32 uart)
{
return UART_FR(uart) & UART_FR_TXFF; return UART_FR(uart) & UART_FR_TXFF;
} }
@ -490,7 +492,8 @@ bool uart_is_tx_fifo_full(u32 uart) {
* @param[in] uart UART block register address base @ref uart_reg_base * @param[in] uart UART block register address base @ref uart_reg_base
*/ */
static inline static inline
bool uart_is_tx_fifo_empty(u32 uart) { bool uart_is_tx_fifo_empty(u32 uart)
{
return UART_FR(uart) & UART_FR_TXFE; return UART_FR(uart) & UART_FR_TXFE;
} }
@ -500,7 +503,8 @@ bool uart_is_tx_fifo_empty(u32 uart) {
* @param[in] uart UART block register address base @ref uart_reg_base * @param[in] uart UART block register address base @ref uart_reg_base
*/ */
static inline static inline
bool uart_is_rx_fifo_full(u32 uart) { bool uart_is_rx_fifo_full(u32 uart)
{
return UART_FR(uart) & UART_FR_RXFF; return UART_FR(uart) & UART_FR_RXFF;
} }
@ -510,7 +514,8 @@ bool uart_is_rx_fifo_full(u32 uart) {
* @param[in] uart UART block register address base @ref uart_reg_base * @param[in] uart UART block register address base @ref uart_reg_base
*/ */
static inline static inline
bool uart_is_rx_fifo_empty(u32 uart) { bool uart_is_rx_fifo_empty(u32 uart)
{
return UART_FR(uart) & UART_FR_RXFE; return UART_FR(uart) & UART_FR_RXFE;
} }
/**@}*/ /**@}*/

42
include/libopencm3/lm4f/usb.h
View File

@ -41,15 +41,15 @@
#include <libopencm3/lm4f/memorymap.h> #include <libopencm3/lm4f/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* ============================================================================= /* ============================================================================
* USB registers * USB registers
* ---------------------------------------------------------------------------*/ * --------------------------------------------------------------------------*/
/* USB Device Functional Address */ /* USB Device Functional Address */
#define USB_FADDR MMIO8 (USB_BASE + 0x00) #define USB_FADDR MMIO8(USB_BASE + 0x00)
/* USB Power */ /* USB Power */
#define USB_POWER MMIO8 (USB_BASE + 0x01) #define USB_POWER MMIO8(USB_BASE + 0x01)
/* USB Transmit Interrupt Status */ /* USB Transmit Interrupt Status */
#define USB_TXIS MMIO16(USB_BASE + 0x02) #define USB_TXIS MMIO16(USB_BASE + 0x02)
@ -64,19 +64,19 @@
#define USB_RXIE MMIO16(USB_BASE + 0x08) #define USB_RXIE MMIO16(USB_BASE + 0x08)
/* USB General Interrupt Status */ /* USB General Interrupt Status */
#define USB_IS MMIO8 (USB_BASE + 0x0A) #define USB_IS MMIO8(USB_BASE + 0x0A)
/* USB Interrupt Enable */ /* USB Interrupt Enable */
#define USB_IE MMIO8 (USB_BASE + 0x0B) #define USB_IE MMIO8(USB_BASE + 0x0B)
/* USB Frame Value */ /* USB Frame Value */
#define USB_FRAME MMIO16(USB_BASE + 0x0C) #define USB_FRAME MMIO16(USB_BASE + 0x0C)
/* USB Endpoint Index */ /* USB Endpoint Index */
#define USB_EPIDX MMIO8 (USB_BASE + 0x0E) #define USB_EPIDX MMIO8(USB_BASE + 0x0E)
/* USB Test Mode */ /* USB Test Mode */
#define USB_TEST MMIO8 (USB_BASE + 0x0F) #define USB_TEST MMIO8(USB_BASE + 0x0F)
/* USB FIFO Endpoint [0-7] */ /* USB FIFO Endpoint [0-7] */
#define USB_FIFO8(n) MMIO8(USB_BASE + 0x20 + n*0x04) #define USB_FIFO8(n) MMIO8(USB_BASE + 0x20 + n*0x04)
@ -84,10 +84,10 @@
#define USB_FIFO32(n) MMIO32(USB_BASE + 0x20 + n*0x04) #define USB_FIFO32(n) MMIO32(USB_BASE + 0x20 + n*0x04)
/* USB Transmit Dynamic FIFO Sizing */ /* USB Transmit Dynamic FIFO Sizing */
#define USB_TXFIFOSZ MMIO8 (USB_BASE + 0x62) #define USB_TXFIFOSZ MMIO8(USB_BASE + 0x62)
/* USB Receive Dynamic FIFO Sizing */ /* USB Receive Dynamic FIFO Sizing */
#define USB_RXFIFOSZ MMIO8 (USB_BASE + 0x63) #define USB_RXFIFOSZ MMIO8(USB_BASE + 0x63)
/* USB Transmit FIFO Start Address */ /* USB Transmit FIFO Start Address */
#define USB_TXFIFOADD MMIO16(USB_BASE + 0x64) #define USB_TXFIFOADD MMIO16(USB_BASE + 0x64)
@ -96,40 +96,40 @@
#define USB_RXFIFOADD MMIO16(USB_BASE + 0x66) #define USB_RXFIFOADD MMIO16(USB_BASE + 0x66)
/* USB Connect Timing */ /* USB Connect Timing */
#define USB_CONTIM MMIO8 (USB_BASE + 0x7A) #define USB_CONTIM MMIO8(USB_BASE + 0x7A)
/* USB Full-Speed Last Transaction to End of Frame Timing */ /* USB Full-Speed Last Transaction to End of Frame Timing */
#define USB_FSEOF MMIO8 (USB_BASE + 0x7D) #define USB_FSEOF MMIO8(USB_BASE + 0x7D)
/* USB Low-Speed Last Transaction to End of Frame Timing */ /* USB Low-Speed Last Transaction to End of Frame Timing */
#define USB_LSEOF MMIO8 (USB_BASE + 0x7E) #define USB_LSEOF MMIO8(USB_BASE + 0x7E)
/* USB Control and Status Endpoint 0 Low */ /* USB Control and Status Endpoint 0 Low */
#define USB_CSRL0 MMIO8 (USB_BASE + 0x102) #define USB_CSRL0 MMIO8(USB_BASE + 0x102)
/* USB Control and Status Endpoint 0 High */ /* USB Control and Status Endpoint 0 High */
#define USB_CSRH0 MMIO8 (USB_BASE + 0x103) #define USB_CSRH0 MMIO8(USB_BASE + 0x103)
/* USB Receive Byte Count Endpoint 0 */ /* USB Receive Byte Count Endpoint 0 */
#define USB_COUNT0 MMIO8 (USB_BASE + 0x108) #define USB_COUNT0 MMIO8(USB_BASE + 0x108)
/* USB Maximum Transmit Data Endpoint [1-7] */ /* USB Maximum Transmit Data Endpoint [1-7] */
#define USB_TXMAXP(n) MMIO16(USB_BASE + 0x100 + n*0x10) #define USB_TXMAXP(n) MMIO16(USB_BASE + 0x100 + n*0x10)
/* USB Transmit Control and Status Endpoint [1-7] Low */ /* USB Transmit Control and Status Endpoint [1-7] Low */
#define USB_TXCSRL(n) MMIO8 (USB_BASE + 0x102 + n*0x10) #define USB_TXCSRL(n) MMIO8(USB_BASE + 0x102 + n*0x10)
/* USB Transmit Control and Status Endpoint [1-7] High */ /* USB Transmit Control and Status Endpoint [1-7] High */
#define USB_TXCSRH(n) MMIO8 (USB_BASE + 0x103 + n*0x10) #define USB_TXCSRH(n) MMIO8(USB_BASE + 0x103 + n*0x10)
/* USB Maximum Receive Data Endpoint [1-7] */ /* USB Maximum Receive Data Endpoint [1-7] */
#define USB_RXMAXP(n) MMIO16(USB_BASE + 0x104 + n*0x10) #define USB_RXMAXP(n) MMIO16(USB_BASE + 0x104 + n*0x10)
/* USB Receive Control and Status Endpoint [1-7] Low */ /* USB Receive Control and Status Endpoint [1-7] Low */
#define USB_RXCSRL(n) MMIO8 (USB_BASE + 0x106 + n*0x10) #define USB_RXCSRL(n) MMIO8(USB_BASE + 0x106 + n*0x10)
/* USB Receive Control and Status Endpoint [1-7] High */ /* USB Receive Control and Status Endpoint [1-7] High */
#define USB_RXCSRH(n) MMIO8 (USB_BASE + 0x107 + n*0x10) #define USB_RXCSRH(n) MMIO8(USB_BASE + 0x107 + n*0x10)
/* USB Receive Byte Count Endpoint [1-7] */ /* USB Receive Byte Count Endpoint [1-7] */
#define USB_RXCOUNT(n) MMIO16(USB_BASE + 0x108 + n*0x10) #define USB_RXCOUNT(n) MMIO16(USB_BASE + 0x108 + n*0x10)
@ -419,4 +419,4 @@ END_DECLS
/**@}*/ /**@}*/
#endif /* LIBOPENCM3_LM4F_USB_H */ #endif /* LIBOPENCM3_LM4F_USB_H */

2
include/libopencm3/lpc17xx/gpio.h
View File

@ -151,7 +151,7 @@ LGPL License Terms @ref lgpl_license
BEGIN_DECLS BEGIN_DECLS
void gpio_set(u32 gpioport, u32 gpios); void gpio_set(u32 gpioport, u32 gpios);
void gpio_clear(u32 gpioport, u32 gpios); void gpio_clear(u32 gpioport, u32 gpios);
END_DECLS END_DECLS

20
include/libopencm3/lpc17xx/memorymap.h
View File

@ -33,12 +33,12 @@
/* APB0 */ /* APB0 */
#define WDT_BASE (PERIPH_BASE_APB0 + 0x00000) #define WDT_BASE (PERIPH_BASE_APB0 + 0x00000)
#define TIMER0_BASE (PERIPH_BASE_APB0 + 0x04000) #define TIMER0_BASE (PERIPH_BASE_APB0 + 0x04000)
#define TIMER1_BASE (PERIPH_BASE_APB0 + 0x08000) #define TIMER1_BASE (PERIPH_BASE_APB0 + 0x08000)
#define UART0_BASE (PERIPH_BASE_APB0 + 0x0c000) #define UART0_BASE (PERIPH_BASE_APB0 + 0x0c000)
#define UART1_BASE (PERIPH_BASE_APB0 + 0x10000) #define UART1_BASE (PERIPH_BASE_APB0 + 0x10000)
/* PERIPH_BASE_APB0 + 0X14000 (0x4001 4000 - 0x4001 7FFF): Reserved */ /* PERIPH_BASE_APB0 + 0X14000 (0x4001 4000 - 0x4001 7FFF): Reserved */
#define PWM1_BASE (PERIPH_BASE_APB0 + 0x18000) #define PWM1_BASE (PERIPH_BASE_APB0 + 0x18000)
#define I2C0_BASE (PERIPH_BASE_APB0 + 0x1c000) #define I2C0_BASE (PERIPH_BASE_APB0 + 0x1c000)
#define SPI_BASE (PERIPH_BASE_APB0 + 0x20000) #define SPI_BASE (PERIPH_BASE_APB0 + 0x20000)
#define RTC_BASE (PERIPH_BASE_APB0 + 0x24000) #define RTC_BASE (PERIPH_BASE_APB0 + 0x24000)
@ -46,13 +46,13 @@
#define PINCONNECT_BASE (PERIPH_BASE_APB0 + 0x2c000) #define PINCONNECT_BASE (PERIPH_BASE_APB0 + 0x2c000)
#define SSP1_BASE (PERIPH_BASE_APB0 + 0x30000) #define SSP1_BASE (PERIPH_BASE_APB0 + 0x30000)
#define ADC_BASE (PERIPH_BASE_APB0 + 0x34000) #define ADC_BASE (PERIPH_BASE_APB0 + 0x34000)
#define CANAFRAM_BASE (PERIPH_BASE_APB0 + 0x38000) #define CANAFRAM_BASE (PERIPH_BASE_APB0 + 0x38000)
#define CANAFREG_BASE (PERIPH_BASE_APB0 + 0x3C000) #define CANAFREG_BASE (PERIPH_BASE_APB0 + 0x3C000)
#define CANCOMMONREG_BASE (PERIPH_BASE_APB0 + 0x40000) #define CANCOMMONREG_BASE (PERIPH_BASE_APB0 + 0x40000)
#define CAN1_BASE (PERIPH_BASE_APB0 + 0x44000) #define CAN1_BASE (PERIPH_BASE_APB0 + 0x44000)
#define CAN2_BASE (PERIPH_BASE_APB0 + 0x48000) #define CAN2_BASE (PERIPH_BASE_APB0 + 0x48000)
/* PERIPH_BASE_APB0 + 0X4C000 (0x4004 C000 - 0x4005 BFFF): Reserved */ /* PERIPH_BASE_APB0 + 0X4C000 (0x4004 C000 - 0x4005 BFFF): Reserved */
#define I2C1_BASE (PERIPH_BASE_APB0 + 0x5C000) #define I2C1_BASE (PERIPH_BASE_APB0 + 0x5C000)
/* PERIPH_BASE_APB0 + 0X60000 (0x6000 0000 - 0x4007 BFFF): Reserved */ /* PERIPH_BASE_APB0 + 0X60000 (0x6000 0000 - 0x4007 BFFF): Reserved */
/* AHB */ /* AHB */

3
include/libopencm3/lpc43xx/creg.h
View File

@ -1,6 +1,7 @@
/** @defgroup creg_defines Configuration Registers Defines /** @defgroup creg_defines Configuration Registers Defines
@brief <b>Defined Constants and Types for the LPC43xx Configuration Registers</b> @brief <b>Defined Constants and Types for the LPC43xx Configuration
Registers</b>
@ingroup LPC43xx_defines @ingroup LPC43xx_defines

3
include/libopencm3/lpc43xx/gima.h
View File

@ -1,6 +1,7 @@
/** @defgroup gima_defines Global Input Multiplexer Array Defines /** @defgroup gima_defines Global Input Multiplexer Array Defines
@brief <b>Defined Constants and Types for the LPC43xx Global Input Multiplexer Array</b> @brief <b>Defined Constants and Types for the LPC43xx Global Input Multiplexer
Array</b>
@ingroup LPC43xx_defines @ingroup LPC43xx_defines

4
include/libopencm3/lpc43xx/gpio.h
View File

@ -88,7 +88,7 @@ LGPL License Terms @ref lgpl_license
/* --- GPIO registers ------------------------------------------------------ */ /* --- GPIO registers ------------------------------------------------------ */
//TODO byte/word access registers /* TODO byte/word access registers */
/* GPIO data direction register (GPIOn_DIR) */ /* GPIO data direction register (GPIOn_DIR) */
#define GPIO_DIR(port) MMIO32(port + 0x00) #define GPIO_DIR(port) MMIO32(port + 0x00)
@ -167,7 +167,7 @@ LGPL License Terms @ref lgpl_license
#define GPIO6_NOT GPIO_NOT(GPIO6) #define GPIO6_NOT GPIO_NOT(GPIO6)
#define GPIO7_NOT GPIO_NOT(GPIO7) #define GPIO7_NOT GPIO_NOT(GPIO7)
//TODO interrupts /* TODO interrupts */
BEGIN_DECLS BEGIN_DECLS

1
include/libopencm3/lpc43xx/i2s.h
View File

@ -45,7 +45,6 @@ LGPL License Terms @ref lgpl_license
#define I2S0 I2S0_BASE #define I2S0 I2S0_BASE
#define I2S1 I2S1_BASE #define I2S1 I2S1_BASE
/* --- I2S registers ------------------------------------------------------- */ /* --- I2S registers ------------------------------------------------------- */
/* I2S Digital Audio Output Register */ /* I2S Digital Audio Output Register */

3
include/libopencm3/lpc43xx/ritimer.h
View File

@ -1,6 +1,7 @@
/** @defgroup ritimer_defines Repetitive Interrupt Timer Defines /** @defgroup ritimer_defines Repetitive Interrupt Timer Defines
@brief <b>Defined Constants and Types for the LPC43xx Repetitive Interrupt Timer</b> @brief <b>Defined Constants and Types for the LPC43xx Repetitive Interrupt
Timer</b>
@ingroup LPC43xx_defines @ingroup LPC43xx_defines

64
include/libopencm3/lpc43xx/scu.h
View File

@ -406,12 +406,13 @@ LGPL License Terms @ref lgpl_license
#define SCU_I2C0_NOMINAL (SCU_SCL_EZI_EN | SCU_SDA_EZI_EN) #define SCU_I2C0_NOMINAL (SCU_SCL_EZI_EN | SCU_SDA_EZI_EN)
/* Standard mode for I2C SCL/SDA Fast-mode Plus transmit */ /* Standard mode for I2C SCL/SDA Fast-mode Plus transmit */
#define SCU_I2C0_FAST (SCU_SCL_EFP | SCU_SCL_EHD | SCU_SCL_EZI_EN | SCU_SCL_ZIF_DIS \ #define SCU_I2C0_FAST (SCU_SCL_EFP | SCU_SCL_EHD | SCU_SCL_EZI_EN | \
SCU_SDA_EFP | SCU_SDA_EHD | SCU_SDA_EZI_EN) SCU_SCL_ZIF_DIS | SCU_SDA_EFP | SCU_SDA_EHD | \
SCU_SDA_EZI_EN)
/* /*
* SCU PIN Normal Drive: * SCU PIN Normal Drive:
* The pin configuration registers for normal-drive pins control the following pins: * The configuration registers for normal-drive pins control the following pins:
* - P0_0 and P0_1 * - P0_0 and P0_1
* - P1_0 to P1_16 and P1_18 to P1_20 * - P1_0 to P1_16 and P1_18 to P1_20
* - P2_0 to P2_2 and P2_6 to P2_13 * - P2_0 to P2_2 and P2_6 to P2_13
@ -429,7 +430,7 @@ LGPL License Terms @ref lgpl_license
* - PF_0 to PF_11 * - PF_0 to PF_11
* *
* Pin configuration registers for High-Drive pins. * Pin configuration registers for High-Drive pins.
* The pin configuration registers for high-drive pins control the following pins: * The configuration registers for high-drive pins control the following pins:
* - P1_17 * - P1_17
* - P2_3 to P2_5 * - P2_3 to P2_5
* - P8_0 to P8_2 * - P8_0 to P8_2
@ -607,7 +608,9 @@ typedef enum {
PC_13 = (PIN_GROUPC+PIN13), PC_13 = (PIN_GROUPC+PIN13),
PC_14 = (PIN_GROUPC+PIN14), PC_14 = (PIN_GROUPC+PIN14),
/* Group Port D (seems not configurable through SCU, not defined in UM10503.pdf Rev.1, keep it here) */ /* Group Port D (seems not configurable through SCU, not defined in
* UM10503.pdf Rev.1, keep it here)
*/
PD_0 = (PIN_GROUPD+PIN0), PD_0 = (PIN_GROUPD+PIN0),
PD_1 = (PIN_GROUPD+PIN1), PD_1 = (PIN_GROUPD+PIN1),
PD_2 = (PIN_GROUPD+PIN2), PD_2 = (PIN_GROUPD+PIN2),
@ -700,21 +703,23 @@ typedef enum {
/* /*
* Select Slew Rate. * Select Slew Rate.
* By Default=0 Slow. * By Default=0 Slow.
* Available to normal-drive pins and high-speed pins, reserved for high-drive pins. * Available to normal-drive and high-speed pins, reserved for high-drive pins.
*/ */
#define SCU_CONF_EHS_FAST (BIT5) #define SCU_CONF_EHS_FAST (BIT5)
/* /*
* Input buffer enable. * Input buffer enable.
* By Default=0 Disable Input Buffer. * By Default=0 Disable Input Buffer.
* The input buffer is disabled by default at reset and must be enabled. * The input buffer is disabled by default at reset and must be enabled for
* for receiving(in normal/highspeed-drive) or to transfer data from the I/O buffer to the pad(in high-drive pins). * receiving(in normal/highspeed-drive) or to transfer data from the I/O buffer
* to the pad(in high-drive pins).
* Available to normal-drive pins, high-drive pins, high-speed pins. * Available to normal-drive pins, high-drive pins, high-speed pins.
*/ */
#define SCU_CONF_EZI_EN_IN_BUFFER (BIT6) #define SCU_CONF_EZI_EN_IN_BUFFER (BIT6)
/* /*
* Input glitch filter. Disable the input glitch filter for clocking signals higher than 30 MHz. * Input glitch filter. Disable the input glitch filter for clocking signals
* higher than 30 MHz.
* Available to normal-drive pins, high-drive pins, high-speed pins. * Available to normal-drive pins, high-drive pins, high-speed pins.
*/ */
#define SCU_CONF_ZIF_DIS_IN_GLITCH_FILT (BIT7) #define SCU_CONF_ZIF_DIS_IN_GLITCH_FILT (BIT7)
@ -730,16 +735,39 @@ typedef enum {
/* BIT10 to 31 are Reserved */ /* BIT10 to 31 are Reserved */
/* Configuration for different I/O pins types */ /* Configuration for different I/O pins types */
#define SCU_EMC_IO (SCU_CONF_EPD_EN_PULLDOWN | SCU_CONF_EHS_FAST | SCU_CONF_EZI_EN_IN_BUFFER | SCU_CONF_ZIF_DIS_IN_GLITCH_FILT) #define SCU_EMC_IO (SCU_CONF_EPD_EN_PULLDOWN | \
#define SCU_LCD (SCU_CONF_EPUN_DIS_PULLUP | SCU_CONF_EHS_FAST | SCU_CONF_EZI_EN_IN_BUFFER | SCU_CONF_ZIF_DIS_IN_GLITCH_FILT) SCU_CONF_EHS_FAST | \
#define SCU_CLK_IN (SCU_CONF_EPD_EN_PULLDOWN | SCU_CONF_EHS_FAST | SCU_CONF_EZI_EN_IN_BUFFER | SCU_CONF_ZIF_DIS_IN_GLITCH_FILT) SCU_CONF_EZI_EN_IN_BUFFER | \
#define SCU_CLK_OUT (SCU_CONF_EPD_EN_PULLDOWN | SCU_CONF_EHS_FAST | SCU_CONF_EZI_EN_IN_BUFFER | SCU_CONF_ZIF_DIS_IN_GLITCH_FILT) SCU_CONF_ZIF_DIS_IN_GLITCH_FILT)
#define SCU_LCD (SCU_CONF_EPUN_DIS_PULLUP | \
SCU_CONF_EHS_FAST | \
SCU_CONF_EZI_EN_IN_BUFFER | \
SCU_CONF_ZIF_DIS_IN_GLITCH_FILT)
#define SCU_CLK_IN (SCU_CONF_EPD_EN_PULLDOWN | \
SCU_CONF_EHS_FAST | \
SCU_CONF_EZI_EN_IN_BUFFER | \
SCU_CONF_ZIF_DIS_IN_GLITCH_FILT)
#define SCU_CLK_OUT (SCU_CONF_EPD_EN_PULLDOWN | \
SCU_CONF_EHS_FAST | \
SCU_CONF_EZI_EN_IN_BUFFER | \
SCU_CONF_ZIF_DIS_IN_GLITCH_FILT)
#define SCU_GPIO_PUP (SCU_CONF_EZI_EN_IN_BUFFER) #define SCU_GPIO_PUP (SCU_CONF_EZI_EN_IN_BUFFER)
#define SCU_GPIO_PDN (SCU_CONF_EPUN_DIS_PULLUP | SCU_CONF_EPD_EN_PULLDOWN | SCU_CONF_EZI_EN_IN_BUFFER) #define SCU_GPIO_PDN (SCU_CONF_EPUN_DIS_PULLUP | \
#define SCU_GPIO_NOPULL (SCU_CONF_EPUN_DIS_PULLUP | SCU_CONF_EZI_EN_IN_BUFFER) SCU_CONF_EPD_EN_PULLDOWN | \
#define SCU_GPIO_FAST (SCU_CONF_EPUN_DIS_PULLUP | SCU_CONF_EHS_FAST | SCU_CONF_EZI_EN_IN_BUFFER | SCU_CONF_ZIF_DIS_IN_GLITCH_FILT) SCU_CONF_EZI_EN_IN_BUFFER)
#define SCU_UART_RX_TX (SCU_CONF_EPUN_DIS_PULLUP | SCU_CONF_EPD_EN_PULLDOWN | SCU_CONF_EZI_EN_IN_BUFFER) #define SCU_GPIO_NOPULL (SCU_CONF_EPUN_DIS_PULLUP | \
#define SCU_SSP_IO (SCU_CONF_EPUN_DIS_PULLUP | SCU_CONF_EHS_FAST | SCU_CONF_EZI_EN_IN_BUFFER | SCU_CONF_ZIF_DIS_IN_GLITCH_FILT) SCU_CONF_EZI_EN_IN_BUFFER)
#define SCU_GPIO_FAST (SCU_CONF_EPUN_DIS_PULLUP | \
SCU_CONF_EHS_FAST | \
SCU_CONF_EZI_EN_IN_BUFFER | \
SCU_CONF_ZIF_DIS_IN_GLITCH_FILT)
#define SCU_UART_RX_TX (SCU_CONF_EPUN_DIS_PULLUP | \
SCU_CONF_EPD_EN_PULLDOWN | \
SCU_CONF_EZI_EN_IN_BUFFER)
#define SCU_SSP_IO (SCU_CONF_EPUN_DIS_PULLUP | \
SCU_CONF_EHS_FAST | \
SCU_CONF_EZI_EN_IN_BUFFER | \
SCU_CONF_ZIF_DIS_IN_GLITCH_FILT)
BEGIN_DECLS BEGIN_DECLS

24
include/libopencm3/lpc43xx/sgpio.h
View File

@ -1,6 +1,7 @@
/** @defgroup sgpio_defines Serial General Purpose I/O /** @defgroup sgpio_defines Serial General Purpose I/O
@brief <b>Defined Constants and Types for the LPC43xx Serial General Purpose I/O</b> @brief <b>Defined Constants and Types for the LPC43xx Serial General Purpose
I/O</b>
@ingroup LPC43xx_defines @ingroup LPC43xx_defines
@ -76,7 +77,8 @@ LGPL License Terms @ref lgpl_license
#define SGPIO_OUT_MUX_CFG15 MMIO32(SGPIO_PORT_BASE + 0x3C) #define SGPIO_OUT_MUX_CFG15 MMIO32(SGPIO_PORT_BASE + 0x3C)
/* SGPIO multiplexer configuration registers (SGPIO_MUX_CFG0 to 15) */ /* SGPIO multiplexer configuration registers (SGPIO_MUX_CFG0 to 15) */
#define SGPIO_MUX_CFG(slice) MMIO32(SGPIO_PORT_BASE + 0x40 + (slice * 0x04)) #define SGPIO_MUX_CFG(slice) MMIO32(SGPIO_PORT_BASE + 0x40 + \
(slice * 0x04))
#define SGPIO_MUX_CFG0 MMIO32(SGPIO_PORT_BASE + 0x40) #define SGPIO_MUX_CFG0 MMIO32(SGPIO_PORT_BASE + 0x40)
#define SGPIO_MUX_CFG1 MMIO32(SGPIO_PORT_BASE + 0x44) #define SGPIO_MUX_CFG1 MMIO32(SGPIO_PORT_BASE + 0x44)
#define SGPIO_MUX_CFG2 MMIO32(SGPIO_PORT_BASE + 0x48) #define SGPIO_MUX_CFG2 MMIO32(SGPIO_PORT_BASE + 0x48)
@ -95,7 +97,8 @@ LGPL License Terms @ref lgpl_license
#define SGPIO_MUX_CFG15 MMIO32(SGPIO_PORT_BASE + 0x7C) #define SGPIO_MUX_CFG15 MMIO32(SGPIO_PORT_BASE + 0x7C)
/* Slice multiplexer configuration registers (SLICE_MUX_CFG0 to 15) */ /* Slice multiplexer configuration registers (SLICE_MUX_CFG0 to 15) */
#define SGPIO_SLICE_MUX_CFG(slice) MMIO32(SGPIO_PORT_BASE + 0x80 + (slice * 0x04)) #define SGPIO_SLICE_MUX_CFG(slice) MMIO32(SGPIO_PORT_BASE + 0x80 + \
(slice * 0x04))
#define SGPIO_SLICE_MUX_CFG0 MMIO32(SGPIO_PORT_BASE + 0x80) #define SGPIO_SLICE_MUX_CFG0 MMIO32(SGPIO_PORT_BASE + 0x80)
#define SGPIO_SLICE_MUX_CFG1 MMIO32(SGPIO_PORT_BASE + 0x84) #define SGPIO_SLICE_MUX_CFG1 MMIO32(SGPIO_PORT_BASE + 0x84)
#define SGPIO_SLICE_MUX_CFG2 MMIO32(SGPIO_PORT_BASE + 0x88) #define SGPIO_SLICE_MUX_CFG2 MMIO32(SGPIO_PORT_BASE + 0x88)
@ -114,7 +117,8 @@ LGPL License Terms @ref lgpl_license
#define SGPIO_SLICE_MUX_CFG15 MMIO32(SGPIO_PORT_BASE + 0xBC) #define SGPIO_SLICE_MUX_CFG15 MMIO32(SGPIO_PORT_BASE + 0xBC)
/* Slice data registers (REG0 to 15) */ /* Slice data registers (REG0 to 15) */
#define SGPIO_REG(slice) MMIO32(SGPIO_PORT_BASE + 0xC0 + (slice * 0x04)) #define SGPIO_REG(slice) MMIO32(SGPIO_PORT_BASE + 0xC0 + \
(slice * 0x04))
#define SGPIO_REG0 MMIO32(SGPIO_PORT_BASE + 0xC0) #define SGPIO_REG0 MMIO32(SGPIO_PORT_BASE + 0xC0)
#define SGPIO_REG1 MMIO32(SGPIO_PORT_BASE + 0xC4) #define SGPIO_REG1 MMIO32(SGPIO_PORT_BASE + 0xC4)
#define SGPIO_REG2 MMIO32(SGPIO_PORT_BASE + 0xC8) #define SGPIO_REG2 MMIO32(SGPIO_PORT_BASE + 0xC8)
@ -133,7 +137,8 @@ LGPL License Terms @ref lgpl_license
#define SGPIO_REG15 MMIO32(SGPIO_PORT_BASE + 0xFC) #define SGPIO_REG15 MMIO32(SGPIO_PORT_BASE + 0xFC)
/* Slice data shadow registers (REG_SS0 to 15) */ /* Slice data shadow registers (REG_SS0 to 15) */
#define SGPIO_REG_SS(slice) MMIO32(SGPIO_PORT_BASE + 0x100 + (slice * 0x04)) #define SGPIO_REG_SS(slice) MMIO32(SGPIO_PORT_BASE + 0x100 + \
(slice * 0x04))
#define SGPIO_REG_SS0 MMIO32(SGPIO_PORT_BASE + 0x100) #define SGPIO_REG_SS0 MMIO32(SGPIO_PORT_BASE + 0x100)
#define SGPIO_REG_SS1 MMIO32(SGPIO_PORT_BASE + 0x104) #define SGPIO_REG_SS1 MMIO32(SGPIO_PORT_BASE + 0x104)
#define SGPIO_REG_SS2 MMIO32(SGPIO_PORT_BASE + 0x108) #define SGPIO_REG_SS2 MMIO32(SGPIO_PORT_BASE + 0x108)
@ -152,7 +157,8 @@ LGPL License Terms @ref lgpl_license
#define SGPIO_REG_SS15 MMIO32(SGPIO_PORT_BASE + 0x13C) #define SGPIO_REG_SS15 MMIO32(SGPIO_PORT_BASE + 0x13C)
/* Reload registers (PRESET0 to 15) */ /* Reload registers (PRESET0 to 15) */
#define SGPIO_PRESET(slice) MMIO32(SGPIO_PORT_BASE + 0x140 + (slice * 0x04)) #define SGPIO_PRESET(slice) MMIO32(SGPIO_PORT_BASE + 0x140 + \
(slice * 0x04))
#define SGPIO_PRESET0 MMIO32(SGPIO_PORT_BASE + 0x140) #define SGPIO_PRESET0 MMIO32(SGPIO_PORT_BASE + 0x140)
#define SGPIO_PRESET1 MMIO32(SGPIO_PORT_BASE + 0x144) #define SGPIO_PRESET1 MMIO32(SGPIO_PORT_BASE + 0x144)
#define SGPIO_PRESET2 MMIO32(SGPIO_PORT_BASE + 0x148) #define SGPIO_PRESET2 MMIO32(SGPIO_PORT_BASE + 0x148)
@ -171,7 +177,8 @@ LGPL License Terms @ref lgpl_license
#define SGPIO_PRESET15 MMIO32(SGPIO_PORT_BASE + 0x17C) #define SGPIO_PRESET15 MMIO32(SGPIO_PORT_BASE + 0x17C)
/* Down counter registers (COUNT0 to 15) */ /* Down counter registers (COUNT0 to 15) */
#define SGPIO_COUNT(slice) MMIO32(SGPIO_PORT_BASE + 0x180 + (slice * 0x04)) #define SGPIO_COUNT(slice) MMIO32(SGPIO_PORT_BASE + 0x180 + \
(slice * 0x04))
#define SGPIO_COUNT0 MMIO32(SGPIO_PORT_BASE + 0x180) #define SGPIO_COUNT0 MMIO32(SGPIO_PORT_BASE + 0x180)
#define SGPIO_COUNT1 MMIO32(SGPIO_PORT_BASE + 0x184) #define SGPIO_COUNT1 MMIO32(SGPIO_PORT_BASE + 0x184)
#define SGPIO_COUNT2 MMIO32(SGPIO_PORT_BASE + 0x188) #define SGPIO_COUNT2 MMIO32(SGPIO_PORT_BASE + 0x188)
@ -190,7 +197,8 @@ LGPL License Terms @ref lgpl_license
#define SGPIO_COUNT15 MMIO32(SGPIO_PORT_BASE + 0x1BC) #define SGPIO_COUNT15 MMIO32(SGPIO_PORT_BASE + 0x1BC)
/* Position registers (POS0 to 15) */ /* Position registers (POS0 to 15) */
#define SGPIO_POS(slice) MMIO32(SGPIO_PORT_BASE + 0x1C0 + (slice * 0x04)) #define SGPIO_POS(slice) MMIO32(SGPIO_PORT_BASE + 0x1C0 + \
(slice * 0x04))
#define SGPIO_POS0 MMIO32(SGPIO_PORT_BASE + 0x1C0) #define SGPIO_POS0 MMIO32(SGPIO_PORT_BASE + 0x1C0)
#define SGPIO_POS1 MMIO32(SGPIO_PORT_BASE + 0x1C4) #define SGPIO_POS1 MMIO32(SGPIO_PORT_BASE + 0x1C4)
#define SGPIO_POS2 MMIO32(SGPIO_PORT_BASE + 0x1C8) #define SGPIO_POS2 MMIO32(SGPIO_PORT_BASE + 0x1C8)

22
include/libopencm3/lpc43xx/ssp.h
View File

@ -1,6 +1,7 @@
/** @defgroup ssp_defines Synchronous Serial Port /** @defgroup ssp_defines Synchronous Serial Port
@brief <b>Defined Constants and Types for the LPC43xx Synchronous Serial Port</b> @brief <b>Defined Constants and Types for the LPC43xx Synchronous Serial
Port</b>
@ingroup LPC43xx_defines @ingroup LPC43xx_defines
@ -109,9 +110,9 @@ typedef enum {
SSP1_NUM = 0x1 SSP1_NUM = 0x1
} ssp_num_t; } ssp_num_t;
/* /*
* SSP Control Register 0 * SSP Control Register 0
*/ */
/* SSP Data Size Bits 0 to 3 */ /* SSP Data Size Bits 0 to 3 */
typedef enum { typedef enum {
SSP_DATA_4BITS = 0x3, SSP_DATA_4BITS = 0x3,
@ -126,7 +127,7 @@ typedef enum {
SSP_DATA_13BITS = 0xC, SSP_DATA_13BITS = 0xC,
SSP_DATA_14BITS = 0xD, SSP_DATA_14BITS = 0xD,
SSP_DATA_15BITS = 0xE, SSP_DATA_15BITS = 0xE,
SSP_DATA_16BITS = 0xF SSP_DATA_16BITS = 0xF
} ssp_datasize_t; } ssp_datasize_t;
/* SSP Frame Format/Type Bits 4 & 5 */ /* SSP Frame Format/Type Bits 4 & 5 */
@ -144,9 +145,9 @@ typedef enum {
SSP_CPOL_1_CPHA_1 = (BIT6|BIT7) SSP_CPOL_1_CPHA_1 = (BIT6|BIT7)
} ssp_cpol_cpha_t; } ssp_cpol_cpha_t;
/* /*
* SSP Control Register 1 * SSP Control Register 1
*/ */
/* SSP Mode Bit0 */ /* SSP Mode Bit0 */
typedef enum { typedef enum {
SSP_MODE_NORMAL = 0x0, SSP_MODE_NORMAL = 0x0,
@ -177,10 +178,11 @@ BEGIN_DECLS
void ssp_disable(ssp_num_t ssp_num); void ssp_disable(ssp_num_t ssp_num);
/* /*
* SSP Init * SSP Init
* clk_prescale shall be in range 2 to 254 (even number only). * clk_prescale shall be in range 2 to 254 (even number only).
* Clock computation: PCLK / (CPSDVSR * [SCR+1]) => CPSDVSR=clk_prescale, SCR=serial_clock_rate * Clock computation: PCLK / (CPSDVSR * [SCR+1]) => CPSDVSR=clk_prescale,
* SCR=serial_clock_rate
*/ */
void ssp_init(ssp_num_t ssp_num, void ssp_init(ssp_num_t ssp_num,
ssp_datasize_t data_size, ssp_datasize_t data_size,

2
include/libopencm3/lpc43xx/usb.h
View File

@ -152,6 +152,6 @@
/* --- USB1 registers ------------------------------------------------------ */ /* --- USB1 registers ------------------------------------------------------ */
//TODO /* TODO */
#endif #endif

3
include/libopencm3/lpc43xx/wwdt.h
View File

@ -1,6 +1,7 @@
/** @defgroup wwdt_defines Windowed Watchdog Timer /** @defgroup wwdt_defines Windowed Watchdog Timer
@brief <b>Defined Constants and Types for the LPC43xx Windowed Watchdog Timer</b> @brief <b>Defined Constants and Types for the LPC43xx Windowed Watchdog
Timer</b>
@ingroup LPC43xx_defines @ingroup LPC43xx_defines

2
include/libopencm3/sam/eefc.h
View File

@ -48,7 +48,7 @@
#define EEFC_FCR_FKEY (0x5A << 24) #define EEFC_FCR_FKEY (0x5A << 24)
#define EEFC_FCR_FARG_MASK (0xFFFF << 8) #define EEFC_FCR_FARG_MASK (0xFFFF << 8)
#define EEFC_FCR_FCMD_MASK (0xFF << 0) #define EEFC_FCR_FCMD_MASK (0xFF << 0)
#define EEFC_FCR_FCMD_GETD (0x00 << 0) #define EEFC_FCR_FCMD_GETD (0x00 << 0)
#define EEFC_FCR_FCMD_WP (0x01 << 0) #define EEFC_FCR_FCMD_WP (0x01 << 0)
#define EEFC_FCR_FCMD_WPL (0x02 << 0) #define EEFC_FCR_FCMD_WPL (0x02 << 0)
#define EEFC_FCR_FCMD_EWP (0x03 << 0) #define EEFC_FCR_FCMD_EWP (0x03 << 0)

6
include/libopencm3/stm32/can.h
View File

@ -159,8 +159,10 @@ LGPL License Terms @ref lgpl_license
* Connectivity line devices have 28 banks so the bank ID spans 0..27 * Connectivity line devices have 28 banks so the bank ID spans 0..27
* all other devices have 14 banks so the bank ID spans 0..13. * all other devices have 14 banks so the bank ID spans 0..13.
*/ */
#define CAN_FiR1(can_base, bank) MMIO32(can_base + 0x240 + (bank * 0x8) + 0x0) #define CAN_FiR1(can_base, bank) MMIO32(can_base + 0x240 + \
#define CAN_FiR2(can_base, bank) MMIO32(can_base + 0x240 + (bank * 0x8) + 0x4) (bank * 0x8) + 0x0)
#define CAN_FiR2(can_base, bank) MMIO32(can_base + 0x240 + \
(bank * 0x8) + 0x4)
/* --- CAN_MCR values ------------------------------------------------------ */ /* --- CAN_MCR values ------------------------------------------------------ */

2
include/libopencm3/stm32/common/crc_common_all.h
View File

@ -23,7 +23,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA CRC.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA CRC.H
The order of header inclusion is important. crc.h includes the device The order of header inclusion is important. crc.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/

5
include/libopencm3/stm32/common/dac_common_all.h
View File

@ -1,6 +1,7 @@
/** @addtogroup dac_defines /** @addtogroup dac_defines
@author @htmlonly &copy; @endhtmlonly 2012 Felix Held <felix-libopencm3@felixheld.de> @author @htmlonly &copy; @endhtmlonly 2012
Felix Held <felix-libopencm3@felixheld.de>
*/ */
@ -25,7 +26,7 @@
/**@{*/ /**@{*/
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA DAC.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA DAC.H
The order of header inclusion is important. dac.h includes the device The order of header inclusion is important. dac.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/

79
include/libopencm3/stm32/common/dma_common_f13.h
View File

@ -1,7 +1,9 @@
/** @addtogroup dma_defines /** @addtogroup dma_defines
@author @htmlonly &copy; @endhtmlonly 2010 Thomas Otto <tommi@viadmin.org> @author @htmlonly &copy; @endhtmlonly 2010
@author @htmlonly &copy; @endhtmlonly 2012 Piotr Esden-Tempski <piotr@esden.net> Thomas Otto <tommi@viadmin.org>
@author @htmlonly &copy; @endhtmlonly 2012
Piotr Esden-Tempski <piotr@esden.net>
*/ */
@ -27,7 +29,7 @@
/**@{*/ /**@{*/
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA DMA.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA DMA.H
The order of header inclusion is important. dma.h includes the device The order of header inclusion is important. dma.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
@ -141,29 +143,36 @@ specific memorymap.h header before including this header file.*/
/* --- DMA_ISR values ------------------------------------------------------ */ /* --- DMA_ISR values ------------------------------------------------------ */
/* --- DMA Interrupt Flag offset values ------------------------------------- */ /* --- DMA Interrupt Flag offset values ------------------------------------- */
/* These are based on every interrupt flag and flag clear being at the same relative location */ /* These are based on every interrupt flag and flag clear being at the same
/** @defgroup dma_if_offset DMA Interrupt Flag Offsets within channel flag group. * relative location
*/
/** @defgroup dma_if_offset DMA Interrupt Flag Offsets within channel flag
group.
@ingroup dma_defines @ingroup dma_defines
@{*/ @{*/
/** Transfer Error Interrupt Flag */ /** Transfer Error Interrupt Flag */
#define DMA_TEIF (1 << 3) #define DMA_TEIF (1 << 3)
/** Half Transfer Interrupt Flag */ /** Half Transfer Interrupt Flag */
#define DMA_HTIF (1 << 2) #define DMA_HTIF (1 << 2)
/** Transfer Complete Interrupt Flag */ /** Transfer Complete Interrupt Flag */
#define DMA_TCIF (1 << 1) #define DMA_TCIF (1 << 1)
/** Global Interrupt Flag */ /** Global Interrupt Flag */
#define DMA_GIF (1 << 0) #define DMA_GIF (1 << 0)
/**@}*/ /**@}*/
/* Offset within interrupt status register to start of channel interrupt flag field */ /* Offset within interrupt status register to start of channel interrupt flag
#define DMA_FLAG_OFFSET(channel) (4*(channel - 1)) * field
#define DMA_FLAGS (DMA_TEIF | DMA_TCIF | DMA_HTIF | DMA_GIF) */
#define DMA_ISR_MASK(channel) DMA_FLAGS << DMA_FLAG_OFFSET(channel) #define DMA_FLAG_OFFSET(channel) (4*(channel - 1))
#define DMA_FLAGS (DMA_TEIF | DMA_TCIF | DMA_HTIF | \
DMA_GIF)
#define DMA_ISR_MASK(channel) (DMA_FLAGS << DMA_FLAG_OFFSET(channel))
/* TEIF: Transfer error interrupt flag */ /* TEIF: Transfer error interrupt flag */
#define DMA_ISR_TEIF_BIT DMA_TEIF #define DMA_ISR_TEIF_BIT DMA_TEIF
#define DMA_ISR_TEIF(channel) (DMA_ISR_TEIF_BIT << (DMA_FLAG_OFFSET(channel))) #define DMA_ISR_TEIF(channel) (DMA_ISR_TEIF_BIT << \
(DMA_FLAG_OFFSET(channel)))
#define DMA_ISR_TEIF1 DMA_ISR_TEIF(DMA_CHANNEL1) #define DMA_ISR_TEIF1 DMA_ISR_TEIF(DMA_CHANNEL1)
#define DMA_ISR_TEIF2 DMA_ISR_TEIF(DMA_CHANNEL2) #define DMA_ISR_TEIF2 DMA_ISR_TEIF(DMA_CHANNEL2)
@ -174,8 +183,9 @@ specific memorymap.h header before including this header file.*/
#define DMA_ISR_TEIF7 DMA_ISR_TEIF(DMA_CHANNEL7) #define DMA_ISR_TEIF7 DMA_ISR_TEIF(DMA_CHANNEL7)
/* HTIF: Half transfer interrupt flag */ /* HTIF: Half transfer interrupt flag */
#define DMA_ISR_HTIF_BIT DMA_HTIF #define DMA_ISR_HTIF_BIT DMA_HTIF
#define DMA_ISR_HTIF(channel) (DMA_ISR_HTIF_BIT << (DMA_FLAG_OFFSET(channel))) #define DMA_ISR_HTIF(channel) (DMA_ISR_HTIF_BIT << \
(DMA_FLAG_OFFSET(channel)))
#define DMA_ISR_HTIF1 DMA_ISR_HTIF(DMA_CHANNEL1) #define DMA_ISR_HTIF1 DMA_ISR_HTIF(DMA_CHANNEL1)
#define DMA_ISR_HTIF2 DMA_ISR_HTIF(DMA_CHANNEL2) #define DMA_ISR_HTIF2 DMA_ISR_HTIF(DMA_CHANNEL2)
@ -186,8 +196,9 @@ specific memorymap.h header before including this header file.*/
#define DMA_ISR_HTIF7 DMA_ISR_HTIF(DMA_CHANNEL7) #define DMA_ISR_HTIF7 DMA_ISR_HTIF(DMA_CHANNEL7)
/* TCIF: Transfer complete interrupt flag */ /* TCIF: Transfer complete interrupt flag */
#define DMA_ISR_TCIF_BIT DMA_TCIF #define DMA_ISR_TCIF_BIT DMA_TCIF
#define DMA_ISR_TCIF(channel) (DMA_ISR_TCIF_BIT << (DMA_FLAG_OFFSET(channel))) #define DMA_ISR_TCIF(channel) (DMA_ISR_TCIF_BIT << \
(DMA_FLAG_OFFSET(channel)))
#define DMA_ISR_TCIF1 DMA_ISR_TCIF(DMA_CHANNEL1) #define DMA_ISR_TCIF1 DMA_ISR_TCIF(DMA_CHANNEL1)
#define DMA_ISR_TCIF2 DMA_ISR_TCIF(DMA_CHANNEL2) #define DMA_ISR_TCIF2 DMA_ISR_TCIF(DMA_CHANNEL2)
@ -199,7 +210,8 @@ specific memorymap.h header before including this header file.*/
/* GIF: Global interrupt flag */ /* GIF: Global interrupt flag */
#define DMA_ISR_GIF_BIT DMA_GIF #define DMA_ISR_GIF_BIT DMA_GIF
#define DMA_ISR_GIF(channel) (DMA_ISR_GIF_BIT << (DMA_FLAG_OFFSET(channel))) #define DMA_ISR_GIF(channel) (DMA_ISR_GIF_BIT << \
(DMA_FLAG_OFFSET(channel)))
#define DMA_ISR_GIF1 DMA_ISR_GIF(DMA_CHANNEL1) #define DMA_ISR_GIF1 DMA_ISR_GIF(DMA_CHANNEL1)
#define DMA_ISR_GIF2 DMA_ISR_GIF(DMA_CHANNEL2) #define DMA_ISR_GIF2 DMA_ISR_GIF(DMA_CHANNEL2)
@ -212,8 +224,9 @@ specific memorymap.h header before including this header file.*/
/* --- DMA_IFCR values ----------------------------------------------------- */ /* --- DMA_IFCR values ----------------------------------------------------- */
/* CTEIF: Transfer error clear */ /* CTEIF: Transfer error clear */
#define DMA_IFCR_CTEIF_BIT DMA_TEIF #define DMA_IFCR_CTEIF_BIT DMA_TEIF
#define DMA_IFCR_CTEIF(channel) (DMA_IFCR_CTEIF_BIT << (DMA_FLAG_OFFSET(channel))) #define DMA_IFCR_CTEIF(channel) (DMA_IFCR_CTEIF_BIT << \
(DMA_FLAG_OFFSET(channel)))
#define DMA_IFCR_CTEIF1 DMA_IFCR_CTEIF(DMA_CHANNEL1) #define DMA_IFCR_CTEIF1 DMA_IFCR_CTEIF(DMA_CHANNEL1)
#define DMA_IFCR_CTEIF2 DMA_IFCR_CTEIF(DMA_CHANNEL2) #define DMA_IFCR_CTEIF2 DMA_IFCR_CTEIF(DMA_CHANNEL2)
@ -224,8 +237,9 @@ specific memorymap.h header before including this header file.*/
#define DMA_IFCR_CTEIF7 DMA_IFCR_CTEIF(DMA_CHANNEL7) #define DMA_IFCR_CTEIF7 DMA_IFCR_CTEIF(DMA_CHANNEL7)
/* CHTIF: Half transfer clear */ /* CHTIF: Half transfer clear */
#define DMA_IFCR_CHTIF_BIT DMA_HTIF #define DMA_IFCR_CHTIF_BIT DMA_HTIF
#define DMA_IFCR_CHTIF(channel) (DMA_IFCR_CHTIF_BIT << (DMA_FLAG_OFFSET(channel))) #define DMA_IFCR_CHTIF(channel) (DMA_IFCR_CHTIF_BIT << \
(DMA_FLAG_OFFSET(channel)))
#define DMA_IFCR_CHTIF1 DMA_IFCR_CHTIF(DMA_CHANNEL1) #define DMA_IFCR_CHTIF1 DMA_IFCR_CHTIF(DMA_CHANNEL1)
#define DMA_IFCR_CHTIF2 DMA_IFCR_CHTIF(DMA_CHANNEL2) #define DMA_IFCR_CHTIF2 DMA_IFCR_CHTIF(DMA_CHANNEL2)
@ -236,8 +250,9 @@ specific memorymap.h header before including this header file.*/
#define DMA_IFCR_CHTIF7 DMA_IFCR_CHTIF(DMA_CHANNEL7) #define DMA_IFCR_CHTIF7 DMA_IFCR_CHTIF(DMA_CHANNEL7)
/* CTCIF: Transfer complete clear */ /* CTCIF: Transfer complete clear */
#define DMA_IFCR_CTCIF_BIT DMA_TCIF #define DMA_IFCR_CTCIF_BIT DMA_TCIF
#define DMA_IFCR_CTCIF(channel) (DMA_IFCR_CTCIF_BIT << (DMA_FLAG_OFFSET(channel))) #define DMA_IFCR_CTCIF(channel) (DMA_IFCR_CTCIF_BIT << \
(DMA_FLAG_OFFSET(channel)))
#define DMA_IFCR_CTCIF1 DMA_IFCR_CTCIF(DMA_CHANNEL1) #define DMA_IFCR_CTCIF1 DMA_IFCR_CTCIF(DMA_CHANNEL1)
#define DMA_IFCR_CTCIF2 DMA_IFCR_CTCIF(DMA_CHANNEL2) #define DMA_IFCR_CTCIF2 DMA_IFCR_CTCIF(DMA_CHANNEL2)
@ -248,8 +263,9 @@ specific memorymap.h header before including this header file.*/
#define DMA_IFCR_CTCIF7 DMA_IFCR_CTCIF(DMA_CHANNEL7) #define DMA_IFCR_CTCIF7 DMA_IFCR_CTCIF(DMA_CHANNEL7)
/* CGIF: Global interrupt clear */ /* CGIF: Global interrupt clear */
#define DMA_IFCR_CGIF_BIT DMA_GIF #define DMA_IFCR_CGIF_BIT DMA_GIF
#define DMA_IFCR_CGIF(channel) (DMA_IFCR_CGIF_BIT << (DMA_FLAG_OFFSET(channel))) #define DMA_IFCR_CGIF(channel) (DMA_IFCR_CGIF_BIT << \
(DMA_FLAG_OFFSET(channel)))
#define DMA_IFCR_CGIF1 DMA_IFCR_CGIF(DMA_CHANNEL1) #define DMA_IFCR_CGIF1 DMA_IFCR_CGIF(DMA_CHANNEL1)
#define DMA_IFCR_CGIF2 DMA_IFCR_CGIF(DMA_CHANNEL2) #define DMA_IFCR_CGIF2 DMA_IFCR_CGIF(DMA_CHANNEL2)
@ -260,8 +276,9 @@ specific memorymap.h header before including this header file.*/
#define DMA_IFCR_CGIF7 DMA_IFCR_CGIF(DMA_CHANNEL7) #define DMA_IFCR_CGIF7 DMA_IFCR_CGIF(DMA_CHANNEL7)
/* Clear interrupts mask */ /* Clear interrupts mask */
#define DMA_IFCR_CIF_BIT 0xF #define DMA_IFCR_CIF_BIT 0xF
#define DMA_IFCR_CIF(channel) (DMA_IFCR_CIF_BIT << (DMA_FLAG_OFFSET(channel))) #define DMA_IFCR_CIF(channel) (DMA_IFCR_CIF_BIT << \
(DMA_FLAG_OFFSET(channel)))
#define DMA_IFCR_CIF1 DMA_IFCR_CIF(DMA_CHANNEL1) #define DMA_IFCR_CIF1 DMA_IFCR_CIF(DMA_CHANNEL1)
#define DMA_IFCR_CIF2 DMA_IFCR_CIF(DMA_CHANNEL2) #define DMA_IFCR_CIF2 DMA_IFCR_CIF(DMA_CHANNEL2)

42
include/libopencm3/stm32/common/dma_common_f24.h
View File

@ -1,7 +1,9 @@
/** @addtogroup dma_defines /** @addtogroup dma_defines
@author @htmlonly &copy; @endhtmlonly 2011 Fergus Noble <fergusnoble@gmail.com> @author @htmlonly &copy; @endhtmlonly 2011
@author @htmlonly &copy; @endhtmlonly 2012 Ken Sarkies <ksarkies@internode.on.net> Fergus Noble <fergusnoble@gmail.com>
@author @htmlonly &copy; @endhtmlonly 2012
Ken Sarkies <ksarkies@internode.on.net>
*/ */
/* /*
@ -24,7 +26,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA DMA.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA DMA.H
The order of header inclusion is important. dma.h includes the device The order of header inclusion is important. dma.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
@ -152,7 +154,8 @@ specific memorymap.h header before including this header file.*/
#define DMA2_S7NDTR DMA2_SNDTR(7) #define DMA2_S7NDTR DMA2_SNDTR(7)
/* DMA Stream x peripheral address register (DMA_SxPAR) */ /* DMA Stream x peripheral address register (DMA_SxPAR) */
#define DMA_SPAR(port, n) *(volatile void **)(DMA_STREAM(port, n) + 0x08) #define DMA_SPAR(port, n) (*(volatile void **)\
(DMA_STREAM(port, n) + 0x08))
#define DMA1_SPAR(n) DMA_SPAR(DMA1, n) #define DMA1_SPAR(n) DMA_SPAR(DMA1, n)
#define DMA2_SPAR(n) DMA_SPAR(DMA2, n) #define DMA2_SPAR(n) DMA_SPAR(DMA2, n)
@ -175,7 +178,8 @@ specific memorymap.h header before including this header file.*/
#define DMA2_S7PAR DMA2_SPAR(7) #define DMA2_S7PAR DMA2_SPAR(7)
/* DMA Stream x memory address 0 register (DMA_SxM0AR) */ /* DMA Stream x memory address 0 register (DMA_SxM0AR) */
#define DMA_SM0AR(port, n) *(volatile void **)(DMA_STREAM(port, n) + 0x0c) #define DMA_SM0AR(port, n) (*(volatile void **) \
(DMA_STREAM(port, n) + 0x0c))
#define DMA1_SM0AR(n) DMA_SM0AR(DMA1, n) #define DMA1_SM0AR(n) DMA_SM0AR(DMA1, n)
#define DMA2_SM0AR(n) DMA_SM0AR(DMA2, n) #define DMA2_SM0AR(n) DMA_SM0AR(DMA2, n)
@ -198,7 +202,8 @@ specific memorymap.h header before including this header file.*/
#define DMA2_S7M0AR DMA2_SM0AR(7) #define DMA2_S7M0AR DMA2_SM0AR(7)
/* DMA Stream x memory address 1 register (DMA_SxM1AR) */ /* DMA Stream x memory address 1 register (DMA_SxM1AR) */
#define DMA_SM1AR(port, n) *(volatile void **)(DMA_STREAM(port, n) + 0x10) #define DMA_SM1AR(port, n) (*(volatile void **)\
(DMA_STREAM(port, n) + 0x10))
#define DMA1_SM1AR(n) DMA_SM1AR(DMA1, n) #define DMA1_SM1AR(n) DMA_SM1AR(DMA1, n)
#define DMA2_SM1AR(n) DMA_SM1AR(DMA2, n) #define DMA2_SM1AR(n) DMA_SM1AR(DMA2, n)
@ -252,21 +257,24 @@ being at the same relative location */
@{*/ @{*/
/** Transfer Complete Interrupt Flag */ /** Transfer Complete Interrupt Flag */
#define DMA_TCIF (1 << 5) #define DMA_TCIF (1 << 5)
/** Half Transfer Interrupt Flag */ /** Half Transfer Interrupt Flag */
#define DMA_HTIF (1 << 4) #define DMA_HTIF (1 << 4)
/** Transfer Error Interrupt Flag */ /** Transfer Error Interrupt Flag */
#define DMA_TEIF (1 << 3) #define DMA_TEIF (1 << 3)
/** Direct Mode Error Interrupt Flag */ /** Direct Mode Error Interrupt Flag */
#define DMA_DMEIF (1 << 2) #define DMA_DMEIF (1 << 2)
/** FIFO Error Interrupt Flag */ /** FIFO Error Interrupt Flag */
#define DMA_FEIF (1 << 0) #define DMA_FEIF (1 << 0)
/**@}*/ /**@}*/
/* Offset within interrupt status register to start of stream interrupt flag field */ /* Offset within interrupt status register to start of stream interrupt flag
#define DMA_ISR_OFFSET(stream) (6*(stream & 0x01)+16*((stream & 0x02) >> 1)) * field
#define DMA_ISR_FLAGS (DMA_TCIF | DMA_HTIF | DMA_TEIF | DMA_DMEIF | DMA_FEIF) */
#define DMA_ISR_MASK(stream) DMA_ISR_FLAGS << DMA_ISR_OFFSET(stream) #define DMA_ISR_OFFSET(stream) (6*(stream & 0x01)+16*((stream & 0x02) >> 1))
#define DMA_ISR_FLAGS (DMA_TCIF | DMA_HTIF | DMA_TEIF | DMA_DMEIF | \
DMA_FEIF)
#define DMA_ISR_MASK(stream) (DMA_ISR_FLAGS << DMA_ISR_OFFSET(stream))
/* --- DMA_LISR values ----------------------------------------------------- */ /* --- DMA_LISR values ----------------------------------------------------- */
@ -560,8 +568,8 @@ being at the same relative location */
BEGIN_DECLS BEGIN_DECLS
/* /*
* Note: The F2 and F4 series have a completely new DMA peripheral with different * Note: The F2 and F4 series have a completely new DMA peripheral with
* configuration options. * different configuration options.
*/ */
void dma_stream_reset(u32 dma, u8 stream); void dma_stream_reset(u32 dma, u8 stream);

6
include/libopencm3/stm32/common/flash_common_f24.h
View File

@ -22,7 +22,7 @@
* For details see: * For details see:
* PM0081 Programming manual: STM32F40xxx and STM32F41xxx Flash programming * PM0081 Programming manual: STM32F40xxx and STM32F41xxx Flash programming
* September 2011, Doc ID 018520 Rev 1 * September 2011, Doc ID 018520 Rev 1
* http://www.st.com/st-web-ui/static/active/en/resource/technical/document/programming_manual/DM00023388.pdf * http://goo.gl/3ylKe
*/ */
/** @cond */ /** @cond */
@ -145,7 +145,7 @@ void flash_program_double_word(u32 address, u64 data);
void flash_program_word(u32 address, u32 data); void flash_program_word(u32 address, u32 data);
void flash_program_half_word(u32 address, u16 data); void flash_program_half_word(u32 address, u16 data);
void flash_program_byte(u32 address, u8 data); void flash_program_byte(u32 address, u8 data);
void flash_program(u32 address, u8* data, u32 len); void flash_program(u32 address, u8 *data, u32 len);
void flash_wait_for_last_operation(void); void flash_wait_for_last_operation(void);
void flash_program_option_bytes(u32 data); void flash_program_option_bytes(u32 data);
@ -154,7 +154,7 @@ END_DECLS
#endif #endif
/** @cond */ /** @cond */
#else #else
#warning "flash_common_f24.h should not be included explicitly, only via flash.h" #warning "flash_common_f24.h should not be included direcitly, only via flash.h"
#endif #endif
/** @endcond */ /** @endcond */

10
include/libopencm3/stm32/common/gpio_common_all.h
View File

@ -1,7 +1,9 @@
/** @addtogroup gpio_defines /** @addtogroup gpio_defines
@author @htmlonly &copy; @endhtmlonly 2011 Fergus Noble <fergusnoble@gmail.com> @author @htmlonly &copy; @endhtmlonly 2011
@author @htmlonly &copy; @endhtmlonly 2012 Ken Sarkies <ksarkies@internode.on.net> Fergus Noble <fergusnoble@gmail.com>
@author @htmlonly &copy; @endhtmlonly 2012
Ken Sarkies <ksarkies@internode.on.net>
*/ */
@ -25,12 +27,12 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA GPIO.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA GPIO.H
The order of header inclusion is important. gpio.h includes the device The order of header inclusion is important. gpio.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
/** @cond */ /** @cond */
#if defined (LIBOPENCM3_GPIO_H) || defined (LIBOPENCM3_GPIO_COMMON_F24_H) #if defined(LIBOPENCM3_GPIO_H) || defined(LIBOPENCM3_GPIO_COMMON_F24_H)
/** @endcond */ /** @endcond */
#ifndef LIBOPENCM3_GPIO_COMMON_ALL_H #ifndef LIBOPENCM3_GPIO_COMMON_ALL_H
#define LIBOPENCM3_GPIO_COMMON_ALL_H #define LIBOPENCM3_GPIO_COMMON_ALL_H

16
include/libopencm3/stm32/common/gpio_common_f24.h
View File

@ -1,7 +1,9 @@
/** @addtogroup gpio_defines /** @addtogroup gpio_defines
@author @htmlonly &copy; @endhtmlonly 2011 Fergus Noble <fergusnoble@gmail.com> @author @htmlonly &copy; @endhtmlonly 2011
@author @htmlonly &copy; @endhtmlonly 2012 Ken Sarkies <ksarkies@internode.on.net> Fergus Noble <fergusnoble@gmail.com>
@author @htmlonly &copy; @endhtmlonly 2012
Ken Sarkies <ksarkies@internode.on.net>
*/ */
/* /*
@ -24,7 +26,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA GPIO.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA GPIO.H
The order of header inclusion is important. gpio.h includes the device The order of header inclusion is important. gpio.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
@ -278,10 +280,10 @@ specific memorymap.h header before including this header file.*/
BEGIN_DECLS BEGIN_DECLS
/* /*
* Note: The F2 and F4 series have a completely new GPIO peripheral with different * Note: The F2 and F4 series have a completely new GPIO peripheral with
* configuration options. Here we implement a different API partly to more * different configuration options. Here we implement a different API partly to
* closely match the peripheral capabilities and also to deliberately break * more closely match the peripheral capabilities and also to deliberately
* compatibility with old F1 code so there is no confusion with similar * break compatibility with old F1 code so there is no confusion with similar
* sounding functions that have very different functionality. * sounding functions that have very different functionality.
*/ */

24
include/libopencm3/stm32/common/hash_common_f24.h
View File

@ -1,6 +1,7 @@
/** @addtogroup hash_defines /** @addtogroup hash_defines
@author @htmlonly &copy; @endhtmlonly 2013 Mikhail Avkhimenia <mikhail@avkhimenia.net> @author @htmlonly &copy; @endhtmlonly 2013
Mikhail Avkhimenia <mikhail@avkhimenia.net>
*/ */
@ -38,32 +39,32 @@
@ingroup STM32F_hash_defines @ingroup STM32F_hash_defines
@{*/ @{*/
#define HASH_BASE (PERIPH_BASE_AHB2 + 0x60400) #define HASH_BASE (PERIPH_BASE_AHB2 + 0x60400)
#define HASH HASH_BASE #define HASH HASH_BASE
/**@}*/ /**@}*/
/* --- HASH registers ------------------------------------------------------ */ /* --- HASH registers ------------------------------------------------------ */
/* HASH control register (HASH_CR) */ /* HASH control register (HASH_CR) */
#define HASH_CR MMIO32(HASH + 0x00) #define HASH_CR MMIO32(HASH + 0x00)
/* HASH data input register (HASH_DIR) */ /* HASH data input register (HASH_DIR) */
#define HASH_DIN MMIO32(HASH + 0x04) #define HASH_DIN MMIO32(HASH + 0x04)
/* HASH start register (HASH_STR) */ /* HASH start register (HASH_STR) */
#define HASH_STR MMIO32(HASH + 0x08) #define HASH_STR MMIO32(HASH + 0x08)
/* HASH digest registers (HASH_HR[5]) */ /* HASH digest registers (HASH_HR[5]) */
#define HASH_HR ((volatile uint32_t*)(HASH + 0x0C)) //x5 #define HASH_HR ((volatile uint32_t*)(HASH + 0x0C)) /* x5 */
/* HASH interrupt enable register (HASH_IMR) */ /* HASH interrupt enable register (HASH_IMR) */
#define HASH_IMR MMIO32(HASH + 0x20) #define HASH_IMR MMIO32(HASH + 0x20)
/* HASH status register (HASH_SR) */ /* HASH status register (HASH_SR) */
#define HASH_SR MMIO32(HASH + 0x28) #define HASH_SR MMIO32(HASH + 0x28)
/* HASH context swap registers (HASH_CSR[51]) */ /* HASH context swap registers (HASH_CSR[51]) */
#define HASH_CSR ((volatile uint32_t*)(HASH + 0xF8)) //x51 #define HASH_CSR ((volatile uint32_t*)(HASH + 0xF8)) /* x51 */
/* --- HASH_CR values ------------------------------------------------------ */ /* --- HASH_CR values ------------------------------------------------------ */
@ -127,7 +128,8 @@
/* --- HASH_STR values ----------------------------------------------------- */ /* --- HASH_STR values ----------------------------------------------------- */
/* NBLW: Number of valid bits in the last word of the message in the bit string */ /* NBLW: Number of valid bits in the last word of the message in the bit string
*/
#define HASH_STR_NBW (31 << 0) #define HASH_STR_NBW (31 << 0)
/* DCAL: Digest calculation */ /* DCAL: Digest calculation */
@ -155,7 +157,7 @@
/* BUSY: Busy bit */ /* BUSY: Busy bit */
#define HASH_SR_BUSY (1 << 3) #define HASH_SR_BUSY (1 << 3)
/* --- HASH function prototypes ------------------------------------------------------- */ /* --- HASH function prototypes -------------------------------------------- */
BEGIN_DECLS BEGIN_DECLS

4
include/libopencm3/stm32/common/i2c_common_all.h
View File

@ -23,12 +23,12 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA I2C.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA I2C.H
The order of header inclusion is important. i2c.h includes the device The order of header inclusion is important. i2c.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
/** @cond */ /** @cond */
#if defined (LIBOPENCM3_I2C_H) || defined (LIBOPENCM3_I2C_COMMON_F24_H) #if defined(LIBOPENCM3_I2C_H) || defined(LIBOPENCM3_I2C_COMMON_F24_H)
/** @endcond */ /** @endcond */
#ifndef LIBOPENCM3_I2C_COMMON_ALL_H #ifndef LIBOPENCM3_I2C_COMMON_ALL_H
#define LIBOPENCM3_I2C_COMMON_ALL_H #define LIBOPENCM3_I2C_COMMON_ALL_H

5
include/libopencm3/stm32/common/i2c_common_f24.h
View File

@ -1,6 +1,7 @@
/** @addtogroup i2c_defines /** @addtogroup i2c_defines
@author @htmlonly &copy; @endhtmlonly 2012 Ken Sarkies <ksarkies@internode.on.net> @author @htmlonly &copy; @endhtmlonly 2012
Ken Sarkies <ksarkies@internode.on.net>
*/ */
@ -23,7 +24,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA I2C.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA I2C.H
The order of header inclusion is important. i2c.h includes the device The order of header inclusion is important. i2c.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/

2
include/libopencm3/stm32/common/iwdg_common_all.h
View File

@ -22,7 +22,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA IWDG.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA IWDG.H
The order of header inclusion is important. iwdg.h includes the device The order of header inclusion is important. iwdg.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/

2
include/libopencm3/stm32/common/pwr_common_all.h
View File

@ -23,7 +23,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA PWR.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA PWR.H
The order of header inclusion is important. pwr.h includes the device The order of header inclusion is important. pwr.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/

4
include/libopencm3/stm32/common/rng_common_f24.h
View File

@ -16,7 +16,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA RNG.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA RNG.H
The order of header inclusion is important. rng.h includes the device The order of header inclusion is important. rng.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
@ -32,7 +32,7 @@ specific memorymap.h header before including this header file.*/
/* --- Random number generator registers ----------------------------------- */ /* --- Random number generator registers ----------------------------------- */
/* Control register */ /* Control register */
#define RNG_CR MMIO32(RNG_BASE + 0x00) #define RNG_CR MMIO32(RNG_BASE + 0x00)
/* Status register */ /* Status register */
#define RNG_SR MMIO32(RNG_BASE + 0x04) #define RNG_SR MMIO32(RNG_BASE + 0x04)

78
include/libopencm3/stm32/common/rtc_common_bcd.h
View File

@ -30,7 +30,7 @@
* only support a subset. * only support a subset.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA RTC.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA RTC.H
The order of header inclusion is important. rtc.h includes the device The order of header inclusion is important. rtc.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
@ -102,7 +102,8 @@ specific memorymap.h header before including this header file.*/
/* RTC time register (RTC_TR) ----------------------------------- */ /* RTC time register (RTC_TR) ----------------------------------- */
/* Note: Bits [31:23], 15, and 7 are reserved, and must be kept at reset value. */ /* Note: Bits [31:23], 15, and 7 are reserved, and must be kept at reset value.
*/
#define RTC_TR_PM (1 << 22) /* AM/PM notation */ #define RTC_TR_PM (1 << 22) /* AM/PM notation */
#define RTC_TR_HT_SHIFT (20) /* Hour tens in BCD format shift */ #define RTC_TR_HT_SHIFT (20) /* Hour tens in BCD format shift */
#define RTC_TR_HT_MASK (0x3) /* Hour tens in BCD format mask */ #define RTC_TR_HT_MASK (0x3) /* Hour tens in BCD format mask */
@ -118,7 +119,8 @@ specific memorymap.h header before including this header file.*/
#define RTC_TR_SU_MASK (0xf) /* Second units in BCD format mask */ #define RTC_TR_SU_MASK (0xf) /* Second units in BCD format mask */
/* RTC date register (RTC_DR) ----------------------------------- */ /* RTC date register (RTC_DR) ----------------------------------- */
/* Note: Bits [31:24] and [7:6] are reserved, and must be kept at reset value. */ /* Note: Bits [31:24] and [7:6] are reserved, and must be kept at reset value.
*/
#define RTC_DR_YT_SHIFT (20) /* Year tens in BCD format shift */ #define RTC_DR_YT_SHIFT (20) /* Year tens in BCD format shift */
#define RTC_DR_YT_MASK (0xf) /* Year tens in BCD format mask */ #define RTC_DR_YT_MASK (0xf) /* Year tens in BCD format mask */
#define RTC_DR_YU_SHIFT (16) /* Year units in BCD format shift */ #define RTC_DR_YU_SHIFT (16) /* Year units in BCD format shift */
@ -136,12 +138,18 @@ specific memorymap.h header before including this header file.*/
/* RTC control register (RTC_CR) -------------------------------- */ /* RTC control register (RTC_CR) -------------------------------- */
/* Note: Bits [31:24] are reserved, and must be kept at reset value. */ /* Note: Bits [31:24] are reserved, and must be kept at reset value. */
/* Note: Bits 7, 6 and 4 of this register can be written in initialization mode only (RTC_ISR/INITF = 1). */ /* Note: Bits 7, 6 and 4 of this register can be written in initialization mode
/* Note: Bits 2 to 0 of this register can be written only when RTC_CR WUTE bit = 0 and RTC_ISR WUTWF bit = 1. */ * only (RTC_ISR/INITF = 1).
*/
/* Note: Bits 2 to 0 of this register can be written only when RTC_CR WUTE bit
* = 0 and RTC_ISR WUTWF bit = 1.
*/
#define RTC_CR_COE (1<<23) /* RTC_CR_COE: Calibration output enable */ #define RTC_CR_COE (1<<23) /* RTC_CR_COE: Calibration output enable */
/* RTC_CR_OSEL: Output selection values */ /* RTC_CR_OSEL: Output selection values */
/* Note: These bits are used to select the flag to be routed to AFO_ALARM RTC output */ /* Note: These bits are used to select the flag to be routed to AFO_ALARM RTC
* output
*/
#define RTC_CR_OSEL_SHIFT 21 #define RTC_CR_OSEL_SHIFT 21
#define RTC_CR_OSEL_MASK (0x3) #define RTC_CR_OSEL_MASK (0x3)
#define RTC_CR_OSEL_DISABLED (0x0) #define RTC_CR_OSEL_DISABLED (0x0)
@ -150,23 +158,34 @@ specific memorymap.h header before including this header file.*/
#define RTC_CR_OSEL_WAKEUP (0x3) #define RTC_CR_OSEL_WAKEUP (0x3)
#define RTC_CR_POL (1<<20) /* RTC_CR_POL: Output polarity */ #define RTC_CR_POL (1<<20) /* RTC_CR_POL: Output polarity */
#define RTC_CR_COSEL (1<<19) /* RTC_CR_COSEL: Calibration output selection */ #define RTC_CR_COSEL (1<<19) /* RTC_CR_COSEL: Calibration output
selection */
#define RTC_CR_BKP (1<<18) /* RTC_CR_BKP: Backup */ #define RTC_CR_BKP (1<<18) /* RTC_CR_BKP: Backup */
#define RTC_CR_SUB1H (1<<17) /* RTC_CR_SUB1H: Subtract 1 hour (winter time change) */ #define RTC_CR_SUB1H (1<<17) /* RTC_CR_SUB1H: Subtract 1 hour
#define RTC_CR_ADD1H (1<<16) /* RTC_CR_ADD1H: Add 1 hour (summer time change) */ (winter time change) */
#define RTC_CR_TSIE (1<<15) /* RTC_CR_TSIE: Timestamp interrupt enable */ #define RTC_CR_ADD1H (1<<16) /* RTC_CR_ADD1H: Add 1 hour (summer
#define RTC_CR_WUTIE (1<<14) /* RTC_CR_WUTIE: Wakeup timer interrupt enable */ time change) */
#define RTC_CR_ALRBIE (1<<13) /* RTC_CR_ALRBIE: Alarm B interrupt enable */ #define RTC_CR_TSIE (1<<15) /* RTC_CR_TSIE: Timestamp interrupt
#define RTC_CR_ALRAIE (1<<12) /* RTC_CR_ALRAIE: Alarm A interrupt enable */ enable */
#define RTC_CR_WUTIE (1<<14) /* RTC_CR_WUTIE: Wakeup timer
interrupt enable */
#define RTC_CR_ALRBIE (1<<13) /* RTC_CR_ALRBIE: Alarm B interrupt
enable */
#define RTC_CR_ALRAIE (1<<12) /* RTC_CR_ALRAIE: Alarm A interrupt
enable */
#define RTC_CR_TSE (1<<11) /* RTC_CR_TSE: Time stamp enable */ #define RTC_CR_TSE (1<<11) /* RTC_CR_TSE: Time stamp enable */
#define RTC_CR_WUTE (1<<10) /* RTC_CR_WUTE: Wakeup timer enable */ #define RTC_CR_WUTE (1<<10) /* RTC_CR_WUTE: Wakeup timer enable */
#define RTC_CR_ALRBE (1<<9) /* RTC_CR_ALRBIE: Alarm B enable */ #define RTC_CR_ALRBE (1<<9) /* RTC_CR_ALRBIE: Alarm B enable */
#define RTC_CR_ALRAE (1<<8) /* RTC_CR_ALRAE: Alarm A enable */ #define RTC_CR_ALRAE (1<<8) /* RTC_CR_ALRAE: Alarm A enable */
#define RTC_CR_DCE (1<<7) /* RTC_CR_DCE: Course digital calibration enable */ #define RTC_CR_DCE (1<<7) /* RTC_CR_DCE: Course digital
calibration enable */
#define RTC_CR_FMT (1<<6) /* RTC_CR_FMT: Hour format */ #define RTC_CR_FMT (1<<6) /* RTC_CR_FMT: Hour format */
#define RTC_CR_BYPSHAD (1<<5) /* RTC_CR_BYPSHAD: Bypass the shadow registers */ #define RTC_CR_BYPSHAD (1<<5) /* RTC_CR_BYPSHAD: Bypass the shadow
#define RTC_CR_REFCKON (1<<4) /* RTC_CR_REFCKON: Reference clock detection enable */ registers */
#define RTC_CR_TSEDGE (1<<3) /* RTC_CR_TSEDGE: Timestamp event active edge */ #define RTC_CR_REFCKON (1<<4) /* RTC_CR_REFCKON: Reference clock
detection enable */
#define RTC_CR_TSEDGE (1<<3) /* RTC_CR_TSEDGE: Timestamp event
active edge */
/* RTC_CR_WUCKSEL: Wakeup clock selection */ /* RTC_CR_WUCKSEL: Wakeup clock selection */
#define RTC_CR_WUCLKSEL_SHIFT (0) #define RTC_CR_WUCLKSEL_SHIFT (0)
@ -181,8 +200,9 @@ specific memorymap.h header before including this header file.*/
/* RTC initialization and status register (RTC_ISR) ------------- */ /* RTC initialization and status register (RTC_ISR) ------------- */
/* Note: Bits [31:17] and [15] are reserved, and must be kept at reset value. */ /* Note: Bits [31:17] and [15] are reserved, and must be kept at reset value. */
/* Note: This register is write protected (except for RTC_ISR[13:8] bits). */ /* Note: This register is write protected (except for RTC_ISR[13:8] bits). */
#define RTC_ISR_RECALPF (1<<16) /* RECALPF: Recalibration pending flag */ #define RTC_ISR_RECALPF (1<<16) /* RECALPF: Recalib pending flag */
#define RTC_ISR_TAMP3F (1<<15) /* TAMP3F: TAMPER3 detection flag (not available on F4)*/ #define RTC_ISR_TAMP3F (1<<15) /* TAMP3F: TAMPER3 detection flag
(not on F4)*/
#define RTC_ISR_TAMP2F (1<<14) /* TAMP2F: TAMPER2 detection flag */ #define RTC_ISR_TAMP2F (1<<14) /* TAMP2F: TAMPER2 detection flag */
#define RTC_ISR_TAMP1F (1<<13) /* TAMP1F: TAMPER detection flag */ #define RTC_ISR_TAMP1F (1<<13) /* TAMP1F: TAMPER detection flag */
#define RTC_ISR_TSOVF (1<<12) /* TSOVF: Timestamp overflow flag */ #define RTC_ISR_TSOVF (1<<12) /* TSOVF: Timestamp overflow flag */
@ -192,21 +212,21 @@ specific memorymap.h header before including this header file.*/
#define RTC_ISR_ALRAF (1<<8) /* ALRAF: Alarm A flag */ #define RTC_ISR_ALRAF (1<<8) /* ALRAF: Alarm A flag */
#define RTC_ISR_INIT (1<<7) /* INIT: Initialization mode */ #define RTC_ISR_INIT (1<<7) /* INIT: Initialization mode */
#define RTC_ISR_INITF (1<<6) /* INITF: Initialization flag */ #define RTC_ISR_INITF (1<<6) /* INITF: Initialization flag */
#define RTC_ISR_RSF (1<<5) /* RSF: Registers synchronization flag */ #define RTC_ISR_RSF (1<<5) /* RSF: Registers sync flag */
#define RTC_ISR_INITS (1<<4) /* INITS: Initialization status flag */ #define RTC_ISR_INITS (1<<4) /* INITS: Init status flag */
#define RTC_ISR_SHPF (1<<3) /* SHPF: Shift operation pending */ #define RTC_ISR_SHPF (1<<3) /* SHPF: Shift operation pending */
#define RTC_ISR_WUTWF (1<<2) /* WUTWF: Wakeup timer write flag */ #define RTC_ISR_WUTWF (1<<2) /* WUTWF: Wakeup timer write flag */
#define RTC_ISR_ALRBWF (1<<1) /* ALRBWF: Alarm B write flag */ #define RTC_ISR_ALRBWF (1<<1) /* ALRBWF: Alarm B write flag */
#define RTC_ISR_ALRAWF (1<<0) /* ALRAWF: Alarm A write flag */ #define RTC_ISR_ALRAWF (1<<0) /* ALRAWF: Alarm A write flag */
/* RTC prescaler register (RTC_PRER) ---------------------------- */ /* RTC prescaler register (RTC_PRER) ---------------------------- */
#define RTC_PRER_PREDIV_A_SHIFT (16) /* Asynchronous prescaler factor shift */ #define RTC_PRER_PREDIV_A_SHIFT (16) /* Async prescaler factor shift */
#define RTC_PRER_PREDIV_A_MASK (0x7f) /* Asynchronous prescaler factor mask */ #define RTC_PRER_PREDIV_A_MASK (0x7f) /* Async prescaler factor mask */
#define RTC_PRER_PREDIV_S_SHIFT (0) /* Synchronous prescaler factor shift */ #define RTC_PRER_PREDIV_S_SHIFT (0) /* Sync prescaler factor shift */
#define RTC_PRER_PREDIV_S_MASK (0x7fff) /* Synchronous prescaler factor mask */ #define RTC_PRER_PREDIV_S_MASK (0x7fff) /* Sync prescaler factor mask */
/* RTC calibration register (RTC_CALIBR) ------------------------ */ /* RTC calibration register (RTC_CALIBR) ------------------------ */
// FIXME - TODO /* FIXME - TODO */
/* RTC Alarm register ------------------------------------------- */ /* RTC Alarm register ------------------------------------------- */
/* Note: Applies to RTC_ALRMAR and RTC_ALRMBR */ /* Note: Applies to RTC_ALRMAR and RTC_ALRMBR */
@ -234,7 +254,7 @@ specific memorymap.h header before including this header file.*/
#define RTC_ALRMXR_SU_MASK (0xf) #define RTC_ALRMXR_SU_MASK (0xf)
/* RTC shift control register (RTC_SHIFTR) */ /* RTC shift control register (RTC_SHIFTR) */
// FIXME - TODO /* FIXME - TODO */
/* RTC time stamp time register (RTC_TSTR) ---------------------- */ /* RTC time stamp time register (RTC_TSTR) ---------------------- */
#define RTC_TSTR_PM (1<<22) #define RTC_TSTR_PM (1<<22)
@ -263,7 +283,7 @@ specific memorymap.h header before including this header file.*/
#define RTC_TSDR_DU_MASK (0xf) #define RTC_TSDR_DU_MASK (0xf)
/* RTC calibration register (RTC_CALR) -------------------------- */ /* RTC calibration register (RTC_CALR) -------------------------- */
// FIXME - TODO /* FIXME - TODO */
/* RTC tamper and alternate function configuration register (RTC_TAFCR) --- */ /* RTC tamper and alternate function configuration register (RTC_TAFCR) --- */
#define RTC_TAFCR_ALARMOUTTYPE (1<<18) #define RTC_TAFCR_ALARMOUTTYPE (1<<18)
@ -304,7 +324,7 @@ specific memorymap.h header before including this header file.*/
#define RTC_TAFCR_TAMP1E (1<<0) #define RTC_TAFCR_TAMP1E (1<<0)
/* RTC alarm X sub second register */ /* RTC alarm X sub second register */
// FIXME - TODO /* FIXME - TODO */

4
include/libopencm3/stm32/common/spi_common_all.h
View File

@ -23,12 +23,12 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA SPI.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA SPI.H
The order of header inclusion is important. spi.h includes the device The order of header inclusion is important. spi.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
/** @cond */ /** @cond */
#if defined (LIBOPENCM3_SPI_H) || defined (LIBOPENCM3_SPI_COMMON_F24_H) #if defined(LIBOPENCM3_SPI_H) || defined(LIBOPENCM3_SPI_COMMON_F24_H)
/** @endcond */ /** @endcond */
#ifndef LIBOPENCM3_SPI_COMMON_ALL_H #ifndef LIBOPENCM3_SPI_COMMON_ALL_H
#define LIBOPENCM3_SPI_COMMON_ALL_H #define LIBOPENCM3_SPI_COMMON_ALL_H

2
include/libopencm3/stm32/common/spi_common_f24.h
View File

@ -22,7 +22,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA SPI.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA SPI.H
The order of header inclusion is important. spi.h includes the device The order of header inclusion is important. spi.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/

30
include/libopencm3/stm32/common/timer_common_all.h
View File

@ -25,12 +25,12 @@
/**@{*/ /**@{*/
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA TIMER.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA TIMER.H
The order of header inclusion is important. timer.h includes the device The order of header inclusion is important. timer.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
/** @cond */ /** @cond */
#if defined (LIBOPENCM3_TIMER_H) || defined (LIBOPENCM3_TIMER_COMMON_F24_H) #if defined(LIBOPENCM3_TIMER_H) || defined(LIBOPENCM3_TIMER_COMMON_F24_H)
/** @endcond */ /** @endcond */
#ifndef LIBOPENCM3_TIMER_COMMON_H #ifndef LIBOPENCM3_TIMER_COMMON_H
#define LIBOPENCM3_TIMER_COMMON_H #define LIBOPENCM3_TIMER_COMMON_H
@ -434,14 +434,19 @@ level. */
/** Encoder mode 3 - Counter counts up/down on both TI1FP1 and TI2FP2 edges /** Encoder mode 3 - Counter counts up/down on both TI1FP1 and TI2FP2 edges
depending on the level of the complementary input. */ depending on the level of the complementary input. */
#define TIM_SMCR_SMS_EM3 (0x3 << 0) #define TIM_SMCR_SMS_EM3 (0x3 << 0)
/** Reset Mode - Rising edge of the selected trigger input (TRGI) reinitializes the counter /** Reset Mode - Rising edge of the selected trigger input (TRGI) reinitializes
and generates an update of the registers. */ * the counter and generates an update of the registers.
*/
#define TIM_SMCR_SMS_RM (0x4 << 0) #define TIM_SMCR_SMS_RM (0x4 << 0)
/** Gated Mode - The counter clock is enabled when the trigger input (TRGI) is high. */ /** Gated Mode - The counter clock is enabled when the trigger input (TRGI) is
* high.
*/
#define TIM_SMCR_SMS_GM (0x5 << 0) #define TIM_SMCR_SMS_GM (0x5 << 0)
/** Trigger Mode - The counter starts at a rising edge of the trigger TRGI. */ /** Trigger Mode - The counter starts at a rising edge of the trigger TRGI. */
#define TIM_SMCR_SMS_TM (0x6 << 0) #define TIM_SMCR_SMS_TM (0x6 << 0)
/** External Clock Mode 1 - Rising edges of the selected trigger (TRGI) clock the counter. */ /** External Clock Mode 1 - Rising edges of the selected trigger (TRGI) clock
* the counter.
*/
#define TIM_SMCR_SMS_ECM1 (0x7 << 0) #define TIM_SMCR_SMS_ECM1 (0x7 << 0)
#define TIM_SMCR_SMS_MASK (0x7 << 0) #define TIM_SMCR_SMS_MASK (0x7 << 0)
/**@}*/ /**@}*/
@ -936,7 +941,7 @@ and generates an update of the registers. */
/** Output Compare channel designators */ /** Output Compare channel designators */
enum tim_oc_id { enum tim_oc_id {
TIM_OC1=0, TIM_OC1 = 0,
TIM_OC1N, TIM_OC1N,
TIM_OC2, TIM_OC2,
TIM_OC2N, TIM_OC2N,
@ -968,8 +973,8 @@ enum tim_ic_id {
/** Input Capture input filter. The frequency used to sample the /** Input Capture input filter. The frequency used to sample the
input and the number of events needed to validate an output transition. input and the number of events needed to validate an output transition.
TIM_IC_CK_INT_N_x No division from the Deadtime and Sampling Clock frequency (DTF), TIM_IC_CK_INT_N_x No division from the Deadtime and Sampling Clock frequency
filter length x (DTF), filter length x
TIM_IC_DTF_DIV_y_N_x Division by y from the DTF, filter length x TIM_IC_DTF_DIV_y_N_x Division by y from the DTF, filter length x
*/ */
enum tim_ic_filter { enum tim_ic_filter {
@ -1020,7 +1025,7 @@ enum tim_et_pol {
TIM_ET_FALLING, TIM_ET_FALLING,
}; };
/* --- TIM function prototypes ------------------------------------------------------- */ /* --- TIM function prototypes --------------------------------------------- */
BEGIN_DECLS BEGIN_DECLS
@ -1064,7 +1069,8 @@ void timer_enable_oc_clear(u32 timer_peripheral, enum tim_oc_id oc_id);
void timer_disable_oc_clear(u32 timer_peripheral, enum tim_oc_id oc_id); void timer_disable_oc_clear(u32 timer_peripheral, enum tim_oc_id oc_id);
void timer_set_oc_fast_mode(u32 timer_peripheral, enum tim_oc_id oc_id); void timer_set_oc_fast_mode(u32 timer_peripheral, enum tim_oc_id oc_id);
void timer_set_oc_slow_mode(u32 timer_peripheral, enum tim_oc_id oc_id); void timer_set_oc_slow_mode(u32 timer_peripheral, enum tim_oc_id oc_id);
void timer_set_oc_mode(u32 timer_peripheral, enum tim_oc_id oc_id, enum tim_oc_mode oc_mode); void timer_set_oc_mode(u32 timer_peripheral, enum tim_oc_id oc_id,
enum tim_oc_mode oc_mode);
void timer_enable_oc_preload(u32 timer_peripheral, enum tim_oc_id oc_id); void timer_enable_oc_preload(u32 timer_peripheral, enum tim_oc_id oc_id);
void timer_disable_oc_preload(u32 timer_peripheral, enum tim_oc_id oc_id); void timer_disable_oc_preload(u32 timer_peripheral, enum tim_oc_id oc_id);
void timer_set_oc_polarity_high(u32 timer_peripheral, enum tim_oc_id oc_id); void timer_set_oc_polarity_high(u32 timer_peripheral, enum tim_oc_id oc_id);
@ -1109,7 +1115,7 @@ END_DECLS
#endif #endif
/** @cond */ /** @cond */
#else #else
#warning "timer_common_all.h should not be included explicitly, only via timer.h" #warning "timer_common_all.h should not be included directly, only via timer.h"
#endif #endif
/** @endcond */ /** @endcond */
/**@}*/ /**@}*/

4
include/libopencm3/stm32/common/timer_common_f24.h
View File

@ -23,7 +23,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA TIMER.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA TIMER.H
The order of header inclusion is important. timer.h includes the device The order of header inclusion is important. timer.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
@ -106,7 +106,7 @@ END_DECLS
#endif #endif
/** @cond */ /** @cond */
#else #else
#warning "timer_common_f24.h should not be included explicitly, only via timer.h" #warning "timer_common_f24.h should not be included directly, only via timer.h"
#endif #endif
/** @endcond */ /** @endcond */

10
include/libopencm3/stm32/common/usart_common_all.h
View File

@ -25,12 +25,12 @@
/**@{*/ /**@{*/
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA USART.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA USART.H
The order of header inclusion is important. usart.h includes the device The order of header inclusion is important. usart.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
/** @cond */ /** @cond */
#if defined (LIBOPENCM3_USART_H) || defined (LIBOPENCM3_USART_COMMON_F24_H) #if defined(LIBOPENCM3_USART_H) || defined(LIBOPENCM3_USART_COMMON_F24_H)
/** @endcond */ /** @endcond */
#ifndef LIBOPENCM3_USART_COMMON_ALL_H #ifndef LIBOPENCM3_USART_COMMON_ALL_H
#define LIBOPENCM3_USART_COMMON_ALL_H #define LIBOPENCM3_USART_COMMON_ALL_H
@ -324,9 +324,9 @@ specific memorymap.h header before including this header file.*/
@{*/ @{*/
#define USART_STOPBITS_1 USART_CR2_STOPBITS_1 /* 1 stop bit */ #define USART_STOPBITS_1 USART_CR2_STOPBITS_1 /* 1 stop bit */
#define USART_STOPBITS_0_5 USART_CR2_STOPBITS_0_5 /* 0.5 stop bits */ #define USART_STOPBITS_0_5 USART_CR2_STOPBITS_0_5 /* .5 stop bit */
#define USART_STOPBITS_2 USART_CR2_STOPBITS_2 /* 2 stop bits */ #define USART_STOPBITS_2 USART_CR2_STOPBITS_2 /* 2 stop bits */
#define USART_STOPBITS_1_5 USART_CR2_STOPBITS_1_5 /* 1.5 stop bits */ #define USART_STOPBITS_1_5 USART_CR2_STOPBITS_1_5 /* 1.5 stop bit*/
/**@}*/ /**@}*/
/* CR3_CTSE/CR3_RTSE combined values */ /* CR3_CTSE/CR3_RTSE combined values */
@ -378,7 +378,7 @@ END_DECLS
#endif #endif
/** @cond */ /** @cond */
#else #else
#warning "usart_common_all.h should not be included explicitly, only via usart.h" #warning "usart_common_all.h should not be included directly, only via usart.h"
#endif #endif
/** @endcond */ /** @endcond */
/**@}*/ /**@}*/

4
include/libopencm3/stm32/common/usart_common_f24.h
View File

@ -24,7 +24,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>. * along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA USART.H /* THIS FILE SHOULD NOT BE INCLUDED DIRECTLY, BUT ONLY VIA USART.H
The order of header inclusion is important. usart.h includes the device The order of header inclusion is important. usart.h includes the device
specific memorymap.h header before including this header file.*/ specific memorymap.h header before including this header file.*/
@ -76,7 +76,7 @@ specific memorymap.h header before including this header file.*/
#endif #endif
/** @cond */ /** @cond */
#else #else
#warning "usart_common_f24.h should not be included explicitly, only via usart.h" #warning "usart_common_f24.h should not be included directly, only via usart.h"
#endif #endif
/** @endcond */ /** @endcond */

27
include/libopencm3/stm32/f1/adc.h
View File

@ -1,12 +1,14 @@
/** @defgroup adc_defines ADC Defines /** @defgroup adc_defines ADC Defines
@brief <b>Defined Constants and Types for the STM32F1xx Analog to Digital Converters</b> @brief <b>Defined Constants and Types for the STM32F1xx Analog to Digital
Converters</b>
@ingroup STM32F1xx_defines @ingroup STM32F1xx_defines
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2009 Edward Cheeseman <evbuilder@users.sourceforge.net> @author @htmlonly &copy; @endhtmlonly 2009
Edward Cheeseman <evbuilder@users.sourceforge.net>
@date 18 August 2012 @date 18 August 2012
@ -404,7 +406,8 @@ LGPL License Terms @ref lgpl_license
/* The following are only valid for ADC1 and ADC2. */ /* The following are only valid for ADC1 and ADC2. */
/****************************************************************************/ /****************************************************************************/
/* ADC_CR2 JEXTSEL[2:0] ADC Injected Trigger Identifier for ADC1 and ADC2 */ /* ADC_CR2 JEXTSEL[2:0] ADC Injected Trigger Identifier for ADC1 and ADC2 */
/** @defgroup adc_trigger_injected_12 ADC Injected Trigger Identifier for ADC1 and ADC2 /** @defgroup adc_trigger_injected_12 ADC Injected Trigger Identifier for ADC1
and ADC2
@ingroup adc_defines @ingroup adc_defines
@{*/ @{*/
@ -677,7 +680,8 @@ void adc_reset_calibration(u32 adc);
void adc_calibration(u32 adc); void adc_calibration(u32 adc);
void adc_set_continuous_conversion_mode(u32 adc); void adc_set_continuous_conversion_mode(u32 adc);
void adc_set_single_conversion_mode(u32 adc); void adc_set_single_conversion_mode(u32 adc);
void adc_on(u32 adc) LIBOPENCM3_DEPRECATED("will be removed in the first release"); void adc_on(u32 adc)
LIBOPENCM3_DEPRECATED("will be removed in the first release");
void adc_off(u32 adc); void adc_off(u32 adc);
void adc_set_sample_time(u32 adc, u8 channel, u8 time); void adc_set_sample_time(u32 adc, u8 channel, u8 time);
void adc_set_sample_time_on_all_channels(u32 adc, u8 time); void adc_set_sample_time_on_all_channels(u32 adc, u8 time);
@ -686,11 +690,16 @@ void adc_set_watchdog_low_threshold(u32 adc, u16 threshold);
void adc_set_regular_sequence(u32 adc, u8 length, u8 channel[]); void adc_set_regular_sequence(u32 adc, u8 length, u8 channel[]);
void adc_set_injected_sequence(u32 adc, u8 length, u8 channel[]); void adc_set_injected_sequence(u32 adc, u8 length, u8 channel[]);
void adc_set_continous_conversion_mode(u32 adc) LIBOPENCM3_DEPRECATED("change to adc_set_continuous_conversion_mode"); void adc_set_continous_conversion_mode(u32 adc)
void adc_set_conversion_time(u32 adc, u8 channel, u8 time) LIBOPENCM3_DEPRECATED("change to adc_set_sample_time"); LIBOPENCM3_DEPRECATED("change to adc_set_continuous_conversion_mode");
void adc_set_conversion_time_on_all_channels(u32 adc, u8 time) LIBOPENCM3_DEPRECATED("change to adc_set_sample_time_on_all_channels"); void adc_set_conversion_time(u32 adc, u8 channel, u8 time)
void adc_enable_jeoc_interrupt(u32 adc) LIBOPENCM3_DEPRECATED("change to adc_enable_eoc_interrupt_injected"); LIBOPENCM3_DEPRECATED("change to adc_set_sample_time");
void adc_disable_jeoc_interrupt(u32 adc) LIBOPENCM3_DEPRECATED("change to adc_disable_eoc_interrupt_injected"); void adc_set_conversion_time_on_all_channels(u32 adc, u8 time)
LIBOPENCM3_DEPRECATED("change to adc_set_sample_time_on_all_channels");
void adc_enable_jeoc_interrupt(u32 adc)
LIBOPENCM3_DEPRECATED("change to adc_enable_eoc_interrupt_injected");
void adc_disable_jeoc_interrupt(u32 adc)
LIBOPENCM3_DEPRECATED("change to adc_disable_eoc_interrupt_injected");
END_DECLS END_DECLS
#endif #endif

3
include/libopencm3/stm32/f1/crc.h
View File

@ -1,6 +1,7 @@
/** @defgroup crc_defines CRC Defines /** @defgroup crc_defines CRC Defines
@brief <b>libopencm3 Defined Constants and Types for the STM32F1xx CRC Generator </b> @brief <b>libopencm3 Defined Constants and Types for the STM32F1xx CRC
Generator </b>
@ingroup STM32F1xx_defines @ingroup STM32F1xx_defines

2
include/libopencm3/stm32/f1/flash.h
View File

@ -22,7 +22,7 @@
* For details see: * For details see:
* PM0075 programming manual: STM32F10xxx Flash programming * PM0075 programming manual: STM32F10xxx Flash programming
* August 2010, Doc ID 17863 Rev 1 * August 2010, Doc ID 17863 Rev 1
* http://www.st.com/st-web-ui/static/active/en/resource/technical/document/programming_manual/CD00283419.pdf * http://goo.gl/MuTiU
*/ */
#ifndef LIBOPENCM3_FLASH_H #ifndef LIBOPENCM3_FLASH_H

105
include/libopencm3/stm32/f1/gpio.h
View File

@ -497,26 +497,26 @@ LGPL License Terms @ref lgpl_license
/* ETH GPIO */ /* ETH GPIO */
#define GPIO_ETH_RX_DV_CRS_DV GPIO7 /* PA7 */ #define GPIO_ETH_RX_DV_CRS_DV GPIO7 /* PA7 */
#define GPIO_ETH_RXD0 GPIO4 /* PC4 */ #define GPIO_ETH_RXD0 GPIO4 /* PC4 */
#define GPIO_ETH_RXD1 GPIO5 /* PC5 */ #define GPIO_ETH_RXD1 GPIO5 /* PC5 */
#define GPIO_ETH_RXD2 GPIO0 /* PB0 */ #define GPIO_ETH_RXD2 GPIO0 /* PB0 */
#define GPIO_ETH_RXD3 GPIO1 /* PB1 */ #define GPIO_ETH_RXD3 GPIO1 /* PB1 */
#define GPIO_ETH_RE_RX_DV_CRS_DV GPIO8 /* PD8 */ #define GPIO_ETH_RE_RX_DV_CRS_DV GPIO8 /* PD8 */
#define GPIO_ETH_RE_RXD0 GPIO9 /* PD9 */ #define GPIO_ETH_RE_RXD0 GPIO9 /* PD9 */
#define GPIO_ETH_RE_RXD1 GPIO10 /* PD10 */ #define GPIO_ETH_RE_RXD1 GPIO10 /* PD10 */
#define GPIO_ETH_RE_RXD2 GPIO11 /* PD11 */ #define GPIO_ETH_RE_RXD2 GPIO11 /* PD11 */
#define GPIO_ETH_RE_RXD3 GPIO12 /* PD12 */ #define GPIO_ETH_RE_RXD3 GPIO12 /* PD12 */
/* ETH BANK */ /* ETH BANK */
#define GPIO_BANK_ETH_RX_DV_CRS_DV GPIOA /* PA7 */ #define GPIO_BANK_ETH_RX_DV_CRS_DV GPIOA /* PA7 */
#define GPIO_BANK_ETH_RXD0 GPIOC /* PC4 */ #define GPIO_BANK_ETH_RXD0 GPIOC /* PC4 */
#define GPIO_BANK_ETH_RXD1 GPIOC /* PC5 */ #define GPIO_BANK_ETH_RXD1 GPIOC /* PC5 */
#define GPIO_BANK_ETH_RXD2 GPIOB /* PB0 */ #define GPIO_BANK_ETH_RXD2 GPIOB /* PB0 */
#define GPIO_BANK_ETH_RXD3 GPIOB /* PB1 */ #define GPIO_BANK_ETH_RXD3 GPIOB /* PB1 */
#define GPIO_BANK_ETH_RE_RX_DV_CRS_DV GPIOD /* PD8 */ #define GPIO_BANK_ETH_RE_RX_DV_CRS_DV GPIOD /* PD8 */
#define GPIO_BANK_ETH_RE_RXD0 GPIOD /* PD9 */ #define GPIO_BANK_ETH_RE_RXD0 GPIOD /* PD9 */
#define GPIO_BANK_ETH_RE_RXD1 GPIOD /* PD10 */ #define GPIO_BANK_ETH_RE_RXD1 GPIOD /* PD10 */
#define GPIO_BANK_ETH_RE_RXD2 GPIOD /* PD11 */ #define GPIO_BANK_ETH_RE_RXD2 GPIOD /* PD11 */
#define GPIO_BANK_ETH_RE_RXD3 GPIOD /* PD12 */ #define GPIO_BANK_ETH_RE_RXD3 GPIOD /* PD12 */
@ -729,28 +729,28 @@ Line Devices only
@ingroup gpio_defines @ingroup gpio_defines
@{*/ @{*/
/* PTP_PPS_REMAP: *//** Ethernet PTP PPS remapping /* PTP_PPS_REMAP: */
* (only connectivity line devices) */ /** Ethernet PTP PPS remapping (only connectivity line devices) */
#define AFIO_MAPR_PTP_PPS_REMAP (1 << 30) #define AFIO_MAPR_PTP_PPS_REMAP (1 << 30)
/* TIM2ITR1_IREMAP: *//** TIM2 internal trigger 1 remapping /* TIM2ITR1_IREMAP: */
* (only connectivity line devices) */ /** TIM2 internal trigger 1 remapping (only connectivity line devices) */
#define AFIO_MAPR_TIM2ITR1_IREMAP (1 << 29) #define AFIO_MAPR_TIM2ITR1_IREMAP (1 << 29)
/* SPI3_REMAP: *//** SPI3/I2S3 remapping /* SPI3_REMAP: */
* (only connectivity line devices) */ /** SPI3/I2S3 remapping (only connectivity line devices) */
#define AFIO_MAPR_SPI3_REMAP (1 << 28) #define AFIO_MAPR_SPI3_REMAP (1 << 28)
/* MII_REMAP: */ /** MII or RMII selection /* MII_REMAP: */
* (only connectivity line devices) */ /** MII or RMII selection (only connectivity line devices) */
#define AFIO_MAPR_MII_RMII_SEL (1 << 23) #define AFIO_MAPR_MII_RMII_SEL (1 << 23)
/* CAN2_REMAP: */ /** CAN2 I/O remapping /* CAN2_REMAP: */
* (only connectivity line devices) */ /** CAN2 I/O remapping (only connectivity line devices) */
#define AFIO_MAPR_CAN2_REMAP (1 << 22) #define AFIO_MAPR_CAN2_REMAP (1 << 22)
/* ETH_REMAP: */ /** Ethernet MAC I/O remapping /* ETH_REMAP: */
* (only connectivity line devices) */ /** Ethernet MAC I/O remapping (only connectivity line devices) */
#define AFIO_MAPR_ETH_REMAP (1 << 21) #define AFIO_MAPR_ETH_REMAP (1 << 21)
/**@}*/ /**@}*/
@ -763,9 +763,9 @@ Line Devices only
@{*/ @{*/
#define AFIO_MAPR_SWJ_MASK (0x7 << 24) #define AFIO_MAPR_SWJ_MASK (0x7 << 24)
/** Full Serial Wire JTAG capability */ /** Full Serial Wire JTAG capability */
#define AFIO_MAPR_SWJ_CFG_FULL_SWJ (0x0 << 24) #define AFIO_MAPR_SWJ_CFG_FULL_SWJ (0x0 << 24)
/** Full Serial Wire JTAG capability without JNTRST */ /** Full Serial Wire JTAG capability without JNTRST */
#define AFIO_MAPR_SWJ_CFG_FULL_SWJ_NO_JNTRST (0x1 << 24) #define AFIO_MAPR_SWJ_CFG_FULL_SWJ_NO_JNTRST (0x1 << 24)
/** JTAG-DP disabled with SW-DP enabled */ /** JTAG-DP disabled with SW-DP enabled */
#define AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON (0x2 << 24) #define AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON (0x2 << 24)
@ -777,41 +777,60 @@ Line Devices only
@ingroup gpio_defines @ingroup gpio_defines
@{*/ @{*/
/* ADC2_ETRGREG_REMAP: */ /** ADC2 external trigger regulator conversion remapping /* ADC2_ETRGREG_REMAP: */
* (only low-, medium-, high- and XL-densitiy devices) */ /**
* ADC2 external trigger regulator conversion remapping
* (only low-, medium-, high- and XL-densitiy devices)
*/
#define AFIO_MAPR_ADC2_ETRGREG_REMAP (1 << 20) #define AFIO_MAPR_ADC2_ETRGREG_REMAP (1 << 20)
/* ADC2_ETRGINJ_REMAP: */ /** ADC2 external trigger injected conversion remapping /* ADC2_ETRGINJ_REMAP: */
* (only low-, medium-, high- and XL-densitiy devices) */ /**
* ADC2 external trigger injected conversion remapping
* (only low-, medium-, high- and XL-densitiy devices)
*/
#define AFIO_MAPR_ADC2_ETRGINJ_REMAP (1 << 19) #define AFIO_MAPR_ADC2_ETRGINJ_REMAP (1 << 19)
/* ADC1_ETRGREG_REMAP: */ /** ADC1 external trigger regulator conversion remapping /* ADC1_ETRGREG_REMAP: */
* (only low-, medium-, high- and XL-densitiy devices) */ /**
* ADC1 external trigger regulator conversion remapping
* (only low-, medium-, high- and XL-densitiy devices)
*/
#define AFIO_MAPR_ADC1_ETRGREG_REMAP (1 << 18) #define AFIO_MAPR_ADC1_ETRGREG_REMAP (1 << 18)
/* ADC1_ETRGINJ_REMAP: */ /** ADC1 external trigger injected conversion remapping /* ADC1_ETRGINJ_REMAP: */
* (only low-, medium-, high- and XL-densitiy devices) */ /**
* ADC1 external trigger injected conversion remapping
* (only low-, medium-, high- and XL-densitiy devices)
*/
#define AFIO_MAPR_ADC1_ETRGINJ_REMAP (1 << 17) #define AFIO_MAPR_ADC1_ETRGINJ_REMAP (1 << 17)
/* TIM5CH4_IREMAP: */ /** TIM5 channel4 internal remap */ /* TIM5CH4_IREMAP: */
/** TIM5 channel4 internal remap */
#define AFIO_MAPR_TIM5CH4_IREMAP (1 << 16) #define AFIO_MAPR_TIM5CH4_IREMAP (1 << 16)
/* PD01_REMAP: */ /** Port D0/Port D1 mapping on OSC_IN/OSC_OUT */ /* PD01_REMAP: */
/** Port D0/Port D1 mapping on OSC_IN/OSC_OUT */
#define AFIO_MAPR_PD01_REMAP (1 << 15) #define AFIO_MAPR_PD01_REMAP (1 << 15)
/* TIM4_REMAP: */ /** TIM4 remapping */ /* TIM4_REMAP: */
/** TIM4 remapping */
#define AFIO_MAPR_TIM4_REMAP (1 << 12) #define AFIO_MAPR_TIM4_REMAP (1 << 12)
/* USART2_REMAP[1:0]: */ /** USART2 remapping */ /* USART2_REMAP[1:0]: */
/** USART2 remapping */
#define AFIO_MAPR_USART2_REMAP (1 << 3) #define AFIO_MAPR_USART2_REMAP (1 << 3)
/* USART1_REMAP[1:0]: */ /** USART1 remapping */ /* USART1_REMAP[1:0]: */
/** USART1 remapping */
#define AFIO_MAPR_USART1_REMAP (1 << 2) #define AFIO_MAPR_USART1_REMAP (1 << 2)
/* I2C1_REMAP[1:0]: */ /** I2C1 remapping */ /* I2C1_REMAP[1:0]: */
/** I2C1 remapping */
#define AFIO_MAPR_I2C1_REMAP (1 << 1) #define AFIO_MAPR_I2C1_REMAP (1 << 1)
/* SPI1_REMAP[1:0]: */ /** SPI1 remapping */ /* SPI1_REMAP[1:0]: */
/** SPI1 remapping */
#define AFIO_MAPR_SPI1_REMAP (1 << 0) #define AFIO_MAPR_SPI1_REMAP (1 << 0)
/**@}*/ /**@}*/
@ -821,7 +840,7 @@ Line Devices only
@{*/ @{*/
#define AFIO_MAPR_CAN1_REMAP_PORTA (0x0 << 13) #define AFIO_MAPR_CAN1_REMAP_PORTA (0x0 << 13)
#define AFIO_MAPR_CAN1_REMAP_PORTB (0x2 << 13) /* Not on 36pin pkg */ #define AFIO_MAPR_CAN1_REMAP_PORTB (0x2 << 13) /* Not 36pin pkg */
#define AFIO_MAPR_CAN1_REMAP_PORTD (0x3 << 13) #define AFIO_MAPR_CAN1_REMAP_PORTD (0x3 << 13)
/**@}*/ /**@}*/
@ -870,22 +889,28 @@ Line Devices only
@ingroup gpio_defines @ingroup gpio_defines
@{*/ @{*/
/* FSMC_NADV_DISCONNECT: */ /** The NADV is disconnected from its allocated pin */ /* FSMC_NADV_DISCONNECT: */
/** The NADV is disconnected from its allocated pin */
#define AFIO_MAPR2_FSMC_NADV_DISCONNECT (1 << 10) #define AFIO_MAPR2_FSMC_NADV_DISCONNECT (1 << 10)
/* TIM14_REMAP: */ /** TIM14 remapping */ /* TIM14_REMAP: */
/** TIM14 remapping */
#define AFIO_MAPR2_TIM14_REMAP (1 << 9) #define AFIO_MAPR2_TIM14_REMAP (1 << 9)
/* TIM13_REMAP: */ /** TIM13 remapping */ /* TIM13_REMAP: */
/** TIM13 remapping */
#define AFIO_MAPR2_TIM13_REMAP (1 << 8) #define AFIO_MAPR2_TIM13_REMAP (1 << 8)
/* TIM11_REMAP: */ /** TIM11 remapping */ /* TIM11_REMAP: */
/** TIM11 remapping */
#define AFIO_MAPR2_TIM11_REMAP (1 << 7) #define AFIO_MAPR2_TIM11_REMAP (1 << 7)
/* TIM10_REMAP: */ /** TIM10 remapping */ /* TIM10_REMAP: */
/** TIM10 remapping */
#define AFIO_MAPR2_TIM10_REMAP (1 << 6) #define AFIO_MAPR2_TIM10_REMAP (1 << 6)
/* TIM9_REMAP: */ /** TIM9 remapping */ /* TIM9_REMAP: */
/** TIM9 remapping */
#define AFIO_MAPR2_TIM9_REMAP (1 << 5) #define AFIO_MAPR2_TIM9_REMAP (1 << 5)
/**@}*/ /**@}*/

3
include/libopencm3/stm32/f1/iwdg.h
View File

@ -1,6 +1,7 @@
/** @defgroup iwdg_defines IWDG Defines /** @defgroup iwdg_defines IWDG Defines
@brief <b>Defined Constants and Types for the STM32F1xx Independent Watchdog Timer</b> @brief <b>Defined Constants and Types for the STM32F1xx Independent Watchdog
Timer</b>
@ingroup STM32F1xx_defines @ingroup STM32F1xx_defines

21
include/libopencm3/stm32/f1/rcc.h
View File

@ -6,8 +6,10 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2009 Federico Ruiz-Ugalde \<memeruiz at gmail dot com\> @author @htmlonly &copy; @endhtmlonly 2009
@author @htmlonly &copy; @endhtmlonly 2009 Uwe Hermann <uwe@hermann-uwe.de> Federico Ruiz-Ugalde \<memeruiz at gmail dot com\>
@author @htmlonly &copy; @endhtmlonly 2009
Uwe Hermann <uwe@hermann-uwe.de>
@date 18 August 2012 @date 18 August 2012
@ -55,8 +57,8 @@ LGPL License Terms @ref lgpl_license
#define RCC_APB1ENR MMIO32(RCC_BASE + 0x1c) #define RCC_APB1ENR MMIO32(RCC_BASE + 0x1c)
#define RCC_BDCR MMIO32(RCC_BASE + 0x20) #define RCC_BDCR MMIO32(RCC_BASE + 0x20)
#define RCC_CSR MMIO32(RCC_BASE + 0x24) #define RCC_CSR MMIO32(RCC_BASE + 0x24)
#define RCC_AHBRSTR MMIO32(RCC_BASE + 0x28) /* (**) */ #define RCC_AHBRSTR MMIO32(RCC_BASE + 0x28) /*(**)*/
#define RCC_CFGR2 MMIO32(RCC_BASE + 0x2c) /* (**) */ #define RCC_CFGR2 MMIO32(RCC_BASE + 0x2c) /*(**)*/
/* --- RCC_CR values ------------------------------------------------------- */ /* --- RCC_CR values ------------------------------------------------------- */
@ -125,9 +127,10 @@ LGPL License Terms @ref lgpl_license
#define RCC_CFGR_PLLMUL_PLL_CLK_MUL13 0xb /* (XX) */ #define RCC_CFGR_PLLMUL_PLL_CLK_MUL13 0xb /* (XX) */
#define RCC_CFGR_PLLMUL_PLL_CLK_MUL14 0xc /* (XX) */ #define RCC_CFGR_PLLMUL_PLL_CLK_MUL14 0xc /* (XX) */
#define RCC_CFGR_PLLMUL_PLL_CLK_MUL15 0xd /* 0xd: PLL x 15 */ #define RCC_CFGR_PLLMUL_PLL_CLK_MUL15 0xd /* 0xd: PLL x 15 */
#define RCC_CFGR_PLLMUL_PLL_CLK_MUL6_5 0xd /* 0xd: PLL x 6.5 for conn. line */ #define RCC_CFGR_PLLMUL_PLL_CLK_MUL6_5 0xd /* 0xd: PLL x 6.5 for conn.
line */
#define RCC_CFGR_PLLMUL_PLL_CLK_MUL16 0xe /* (XX) */ #define RCC_CFGR_PLLMUL_PLL_CLK_MUL16 0xe /* (XX) */
// #define PLLMUL_PLL_CLK_MUL16 0xf /* (XX) */ /* Errata? 17? */ /* #define PLLMUL_PLL_CLK_MUL16 0xf */ /* (XX) */ /* Errata? 17? */
/**@}*/ /**@}*/
/* TODO: conn. line differs. */ /* TODO: conn. line differs. */
@ -286,7 +289,8 @@ LGPL License Terms @ref lgpl_license
#define RCC_APB1RSTR_BKPRST (1 << 27) #define RCC_APB1RSTR_BKPRST (1 << 27)
#define RCC_APB1RSTR_CAN2RST (1 << 26) /* (**) */ #define RCC_APB1RSTR_CAN2RST (1 << 26) /* (**) */
#define RCC_APB1RSTR_CAN1RST (1 << 25) /* (**) */ #define RCC_APB1RSTR_CAN1RST (1 << 25) /* (**) */
#define RCC_APB1RSTR_CANRST (1 << 25) /* (XX) Alias for CAN1RST */ #define RCC_APB1RSTR_CANRST (1 << 25) /* (XX) Alias for
CAN1RST */
#define RCC_APB1RSTR_USBRST (1 << 23) /* (XX) */ #define RCC_APB1RSTR_USBRST (1 << 23) /* (XX) */
#define RCC_APB1RSTR_I2C2RST (1 << 22) #define RCC_APB1RSTR_I2C2RST (1 << 22)
#define RCC_APB1RSTR_I2C1RST (1 << 21) #define RCC_APB1RSTR_I2C1RST (1 << 21)
@ -358,7 +362,8 @@ LGPL License Terms @ref lgpl_license
#define RCC_APB1ENR_BKPEN (1 << 27) #define RCC_APB1ENR_BKPEN (1 << 27)
#define RCC_APB1ENR_CAN2EN (1 << 26) /* (**) */ #define RCC_APB1ENR_CAN2EN (1 << 26) /* (**) */
#define RCC_APB1ENR_CAN1EN (1 << 25) /* (**) */ #define RCC_APB1ENR_CAN1EN (1 << 25) /* (**) */
#define RCC_APB1ENR_CANEN (1 << 25) /* (XX) Alias for CAN1EN */ #define RCC_APB1ENR_CANEN (1 << 25) /* (XX) Alias for
CAN1EN */
#define RCC_APB1ENR_USBEN (1 << 23) /* (XX) */ #define RCC_APB1ENR_USBEN (1 << 23) /* (XX) */
#define RCC_APB1ENR_I2C2EN (1 << 22) #define RCC_APB1ENR_I2C2EN (1 << 22)
#define RCC_APB1ENR_I2C1EN (1 << 21) #define RCC_APB1ENR_I2C1EN (1 << 21)

9
include/libopencm3/stm32/f1/usb.h
View File

@ -6,7 +6,8 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2009 Piotr Esden-Tempski <piotr@esden.net> @author @htmlonly &copy; @endhtmlonly 2009
Piotr Esden-Tempski <piotr@esden.net>
@date 11 March 2013 @date 11 March 2013
@ -131,9 +132,9 @@ LGPL License Terms @ref lgpl_license
#define USB_EP_SETUP 0x0800 /* Setup transaction completed */ #define USB_EP_SETUP 0x0800 /* Setup transaction completed */
#define USB_EP_TYPE 0x0600 /* Endpoint type */ #define USB_EP_TYPE 0x0600 /* Endpoint type */
#define USB_EP_KIND 0x0100 /* Endpoint kind. #define USB_EP_KIND 0x0100 /* Endpoint kind.
* When set and type=bulk -> double buffer * When set and type=bulk -> double buffer
* When set and type=control -> status out * When set and type=control -> status out
*/ */
#define USB_EP_TX_CTR 0x0080 /* Correct transfer TX */ #define USB_EP_TX_CTR 0x0080 /* Correct transfer TX */
#define USB_EP_TX_DTOG 0x0040 /* Data toggle TX */ #define USB_EP_TX_DTOG 0x0040 /* Data toggle TX */

3
include/libopencm3/stm32/f2/crc.h
View File

@ -1,6 +1,7 @@
/** @defgroup crc_defines CRC Defines /** @defgroup crc_defines CRC Defines
@brief <b>libopencm3 Defined Constants and Types for the STM32F2xx CRC Generator </b> @brief <b>libopencm3 Defined Constants and Types for the STM32F2xx CRC
Generator </b>
@ingroup STM32F2xx_defines @ingroup STM32F2xx_defines

3
include/libopencm3/stm32/f2/iwdg.h
View File

@ -1,6 +1,7 @@
/** @defgroup iwdg_defines IWDG Defines /** @defgroup iwdg_defines IWDG Defines
@brief <b>Defined Constants and Types for the STM32F2xx Independent Watchdog Timer</b> @brief <b>Defined Constants and Types for the STM32F2xx Independent Watchdog
Timer</b>
@ingroup STM32F2xx_defines @ingroup STM32F2xx_defines

2
include/libopencm3/stm32/f2/memorymap.h
View File

@ -22,7 +22,7 @@
#include <libopencm3/cm3/memorymap.h> #include <libopencm3/cm3/memorymap.h>
/* --- STM32F20x specific peripheral definitions ------------------------------- */ /* --- STM32F20x specific peripheral definitions --------------------------- */
/* Memory map for all busses */ /* Memory map for all busses */
#define PERIPH_BASE 0x40000000 #define PERIPH_BASE 0x40000000

6
include/libopencm3/stm32/f2/rcc.h
View File

@ -77,7 +77,7 @@
#define RCC_CR_HSIRDY (1 << 1) #define RCC_CR_HSIRDY (1 << 1)
#define RCC_CR_HSION (1 << 0) #define RCC_CR_HSION (1 << 0)
/* --- RCC_PLLCFGR values ------------------------------------------------------- */ /* --- RCC_PLLCFGR values -------------------------------------------------- */
/* PLLQ: [27:24] */ /* PLLQ: [27:24] */
#define RCC_PLLCFGR_PLLQ_SHIFT 24 #define RCC_PLLCFGR_PLLQ_SHIFT 24
@ -342,8 +342,8 @@
#define RCC_AHB1LPENR_DMA1LPEN (1 << 21) #define RCC_AHB1LPENR_DMA1LPEN (1 << 21)
#define RCC_AHB1LPENR_BKPSRAMLPEN (1 << 18) #define RCC_AHB1LPENR_BKPSRAMLPEN (1 << 18)
#define RCC_AHB1LPENR_SRAM2LPEN (1 << 17) #define RCC_AHB1LPENR_SRAM2LPEN (1 << 17)
#define RCC_AHB1LPENR_SRAM1LPEN (1 << 16) #define RCC_AHB1LPENR_SRAM1LPEN (1 << 16)
#define RCC_AHB1LPENR_FLITFLPEN (1 << 15) #define RCC_AHB1LPENR_FLITFLPEN (1 << 15)
#define RCC_AHB1LPENR_CRCLPEN (1 << 12) #define RCC_AHB1LPENR_CRCLPEN (1 << 12)
#define RCC_AHB1LPENR_IOPILPEN (1 << 8) #define RCC_AHB1LPENR_IOPILPEN (1 << 8)
#define RCC_AHB1LPENR_IOPHLPEN (1 << 7) #define RCC_AHB1LPENR_IOPHLPEN (1 << 7)

64
include/libopencm3/stm32/f4/adc.h
View File

@ -1,13 +1,16 @@
/** @defgroup STM32F4xx_adc_defines ADC Defines /** @defgroup STM32F4xx_adc_defines ADC Defines
@brief <b>Defined Constants and Types for the STM32F4xx Analog to Digital Converters</b> @brief <b>Defined Constants and Types for the STM32F4xx Analog to Digital
Converters</b>
@ingroup STM32F4xx_defines @ingroup STM32F4xx_defines
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2012 Matthew Lai <m@matthewlai.ca> @author @htmlonly &copy; @endhtmlonly 2012
@author @htmlonly &copy; @endhtmlonly 2009 Edward Cheeseman <evbuilder@users.sourceforge.net> Matthew Lai <m@matthewlai.ca>
@author @htmlonly &copy; @endhtmlonly 2009
Edward Cheeseman <evbuilder@users.sourceforge.net>
@date 31 August 2012 @date 31 August 2012
@ -164,9 +167,9 @@ LGPL License Terms @ref lgpl_license
/* ADC common (shared) registers */ /* ADC common (shared) registers */
#define ADC_COMMON_REGISTERS_BASE (ADC1_BASE+0x300) #define ADC_COMMON_REGISTERS_BASE (ADC1_BASE+0x300)
#define ADC_CSR MMIO32(ADC_COMMON_REGISTERS_BASE + 0x0) #define ADC_CSR MMIO32(ADC_COMMON_REGISTERS_BASE + 0x0)
#define ADC_CCR MMIO32(ADC_COMMON_REGISTERS_BASE + 0x4) #define ADC_CCR MMIO32(ADC_COMMON_REGISTERS_BASE + 0x4)
#define ADC_CDR MMIO32(ADC_COMMON_REGISTERS_BASE + 0x8) #define ADC_CDR MMIO32(ADC_COMMON_REGISTERS_BASE + 0x8)
/* --- ADC Channels ------------------------------------------------------- */ /* --- ADC Channels ------------------------------------------------------- */
@ -207,7 +210,7 @@ LGPL License Terms @ref lgpl_license
#define ADC_SR_EOC (1 << 1) #define ADC_SR_EOC (1 << 1)
#define ADC_SR_AWD (1 << 0) #define ADC_SR_AWD (1 << 0)
/* --- ADC_CR1 values specific to STM32F2,4------------------------------------ */ /* --- ADC_CR1 values specific to STM32F2,4--------------------------------- */
/* OVRIE: Overrun interrupt enable */ /* OVRIE: Overrun interrupt enable */
#define ADC_CR1_OVRIE (1 << 26) #define ADC_CR1_OVRIE (1 << 26)
@ -281,7 +284,7 @@ LGPL License Terms @ref lgpl_license
/* AWDCH[4:0]: Analog watchdog channel bits. (Up to 17 other values reserved) */ /* AWDCH[4:0]: Analog watchdog channel bits. (Up to 17 other values reserved) */
/* Notes: /* Notes:
* ADC1: Analog channel 16 and 17 are internally connected to the temperature * ADC1: Analog channel 16 and 17 are internally connected to the temperature
* sensor and V_REFINT, respectively. * sensor and V_REFINT, respectively.
* ADC2: Analog channel 16 and 17 are internally connected to V_SS. * ADC2: Analog channel 16 and 17 are internally connected to V_SS.
* ADC3: Analog channel 9, 14, 15, 16 and 17 are internally connected to V_SS. * ADC3: Analog channel 9, 14, 15, 16 and 17 are internally connected to V_SS.
*/ */
@ -567,7 +570,8 @@ LGPL License Terms @ref lgpl_license
/* JL[2:0]: Discontinous mode channel count injected channels. */ /* JL[2:0]: Discontinous mode channel count injected channels. */
/****************************************************************************/ /****************************************************************************/
/** @defgroup adc_jsqr_jl ADC Number of channels in discontinuous mode fro injected channels. /** @defgroup adc_jsqr_jl ADC Number of channels in discontinuous mode fro
injected channels.
@ingroup STM32F4xx_adc_defines @ingroup STM32F4xx_adc_defines
@{*/ @{*/
@ -733,33 +737,45 @@ LGPL License Terms @ref lgpl_license
/** All ADCs independent */ /** All ADCs independent */
#define ADC_CCR_MULTI_INDEPENDENT (0x00 << 0) #define ADC_CCR_MULTI_INDEPENDENT (0x00 << 0)
/* dual modes (ADC1 + ADC2) */ /* Dual modes (ADC1 + ADC2) */
/** Dual modes (ADC1 + ADC2) Combined regular simultaneous + injected simultaneous mode */ /**
* Dual modes (ADC1 + ADC2) Combined regular simultaneous +
* injected simultaneous mode.
*/
#define ADC_CCR_MULTI_DUAL_REG_SIMUL_AND_INJECTED_SIMUL (0x01 << 0) #define ADC_CCR_MULTI_DUAL_REG_SIMUL_AND_INJECTED_SIMUL (0x01 << 0)
/** Dual modes (ADC1 + ADC2) Combined regular simultaneous + alternate trigger mode. */ /**
* Dual modes (ADC1 + ADC2) Combined regular simultaneous +
* alternate trigger mode.
*/
#define ADC_CCR_MULTI_DUAL_REG_SIMUL_AND_ALTERNATE_TRIG (0x02 << 0) #define ADC_CCR_MULTI_DUAL_REG_SIMUL_AND_ALTERNATE_TRIG (0x02 << 0)
/** Dual modes (ADC1 + ADC2) Injected simultaneous mode only. */ /** Dual modes (ADC1 + ADC2) Injected simultaneous mode only. */
#define ADC_CCR_MULTI_DUAL_INJECTED_SIMUL (0x05 << 0) #define ADC_CCR_MULTI_DUAL_INJECTED_SIMUL (0x05 << 0)
/** Dual modes (ADC1 + ADC2) Regular simultaneous mode only. */ /** Dual modes (ADC1 + ADC2) Regular simultaneous mode only. */
#define ADC_CCR_MULTI_DUAL_REGULAR_SIMUL (0x06 << 0) #define ADC_CCR_MULTI_DUAL_REGULAR_SIMUL (0x06 << 0)
/** Dual modes (ADC1 + ADC2) Interleaved mode only. */ /** Dual modes (ADC1 + ADC2) Interleaved mode only. */
#define ADC_CCR_MULTI_DUAL_INTERLEAVED (0x07 << 0) #define ADC_CCR_MULTI_DUAL_INTERLEAVED (0x07 << 0)
/** Dual modes (ADC1 + ADC2) Alternate trigger mode only. */ /** Dual modes (ADC1 + ADC2) Alternate trigger mode only. */
#define ADC_CCR_MULTI_DUAL_ALTERNATE_TRIG (0x09 << 0) #define ADC_CCR_MULTI_DUAL_ALTERNATE_TRIG (0x09 << 0)
/* Triple modes (ADC1 + ADC2 + ADC3) */ /* Triple modes (ADC1 + ADC2 + ADC3) */
/** Triple modes (ADC1 + ADC2 + ADC3) Combined regular simultaneous + injected simultaneous mode */ /**
#define ADC_CCR_MULTI_TRIPLE_REG_SIMUL_AND_INJECTED_SIMUL (0x11 << 0) * Triple modes (ADC1 + ADC2 + ADC3) Combined regular simultaneous +
/** Triple modes (ADC1 + ADC2 + ADC3) Combined regular simultaneous + alternate trigger mode. */ * injected simultaneous mode.
#define ADC_CCR_MULTI_TRIPLE_REG_SIMUL_AND_ALTERNATE_TRIG (0x12 << 0) */
#define ADC_CCR_MULTI_TRIPLE_REG_SIMUL_AND_INJECTED_SIMUL (0x11 << 0)
/**
* Triple modes (ADC1 + ADC2 + ADC3) Combined regular simultaneous +
* alternate trigger mode.
*/
#define ADC_CCR_MULTI_TRIPLE_REG_SIMUL_AND_ALTERNATE_TRIG (0x12 << 0)
/** Triple modes (ADC1 + ADC2 + ADC3) Injected simultaneous mode only. */ /** Triple modes (ADC1 + ADC2 + ADC3) Injected simultaneous mode only. */
#define ADC_CCR_MULTI_TRIPLE_INJECTED_SIMUL (0x15 << 0) #define ADC_CCR_MULTI_TRIPLE_INJECTED_SIMUL (0x15 << 0)
/** Triple modes (ADC1 + ADC2 + ADC3) Regular simultaneous mode only. */ /** Triple modes (ADC1 + ADC2 + ADC3) Regular simultaneous mode only. */
#define ADC_CCR_MULTI_TRIPLE_REGULAR_SIMUL (0x16 << 0) #define ADC_CCR_MULTI_TRIPLE_REGULAR_SIMUL (0x16 << 0)
/** Triple modes (ADC1 + ADC2 + ADC3) Interleaved mode only. */ /** Triple modes (ADC1 + ADC2 + ADC3) Interleaved mode only. */
#define ADC_CCR_MULTI_TRIPLE_INTERLEAVED (0x17 << 0) #define ADC_CCR_MULTI_TRIPLE_INTERLEAVED (0x17 << 0)
/** Triple modes (ADC1 + ADC2 + ADC3) Alternate trigger mode only. */ /** Triple modes (ADC1 + ADC2 + ADC3) Alternate trigger mode only. */
#define ADC_CCR_MULTI_TRIPLE_ALTERNATE_TRIG (0x19 << 0) #define ADC_CCR_MULTI_TRIPLE_ALTERNATE_TRIG (0x19 << 0)
/**@}*/ /**@}*/
#define ADC_CCR_MULTI_MASK (0x1f << 0) #define ADC_CCR_MULTI_MASK (0x1f << 0)

3
include/libopencm3/stm32/f4/crc.h
View File

@ -1,6 +1,7 @@
/** @defgroup crc_defines CRC Defines /** @defgroup crc_defines CRC Defines
@brief <b>libopencm3 Defined Constants and Types for the STM32F4xx CRC Generator </b> @brief <b>libopencm3 Defined Constants and Types for the STM32F4xx CRC
Generator </b>
@ingroup STM32F4xx_defines @ingroup STM32F4xx_defines

3
include/libopencm3/stm32/f4/iwdg.h
View File

@ -1,6 +1,7 @@
/** @defgroup iwdg_defines IWDG Defines /** @defgroup iwdg_defines IWDG Defines
@brief <b>Defined Constants and Types for the STM32F4xx Independent Watchdog Timer</b> @brief <b>Defined Constants and Types for the STM32F4xx Independent Watchdog
Timer</b>
@ingroup STM32F4xx_defines @ingroup STM32F4xx_defines

6
include/libopencm3/stm32/f4/rcc.h
View File

@ -78,7 +78,7 @@
#define RCC_CR_HSIRDY (1 << 1) #define RCC_CR_HSIRDY (1 << 1)
#define RCC_CR_HSION (1 << 0) #define RCC_CR_HSION (1 << 0)
/* --- RCC_PLLCFGR values ------------------------------------------------------- */ /* --- RCC_PLLCFGR values -------------------------------------------------- */
/* PLLQ: [27:24] */ /* PLLQ: [27:24] */
#define RCC_PLLCFGR_PLLQ_SHIFT 24 #define RCC_PLLCFGR_PLLQ_SHIFT 24
@ -343,8 +343,8 @@
#define RCC_AHB1LPENR_DMA1LPEN (1 << 21) #define RCC_AHB1LPENR_DMA1LPEN (1 << 21)
#define RCC_AHB1LPENR_BKPSRAMLPEN (1 << 18) #define RCC_AHB1LPENR_BKPSRAMLPEN (1 << 18)
#define RCC_AHB1LPENR_SRAM2LPEN (1 << 17) #define RCC_AHB1LPENR_SRAM2LPEN (1 << 17)
#define RCC_AHB1LPENR_SRAM1LPEN (1 << 16) #define RCC_AHB1LPENR_SRAM1LPEN (1 << 16)
#define RCC_AHB1LPENR_FLITFLPEN (1 << 15) #define RCC_AHB1LPENR_FLITFLPEN (1 << 15)
#define RCC_AHB1LPENR_CRCLPEN (1 << 12) #define RCC_AHB1LPENR_CRCLPEN (1 << 12)
#define RCC_AHB1LPENR_IOPILPEN (1 << 8) #define RCC_AHB1LPENR_IOPILPEN (1 << 8)
#define RCC_AHB1LPENR_IOPHLPEN (1 << 7) #define RCC_AHB1LPENR_IOPHLPEN (1 << 7)

3
include/libopencm3/stm32/hash.h
View File

@ -22,5 +22,6 @@
#elif defined(STM32F4) #elif defined(STM32F4)
# include <libopencm3/stm32/f4/hash.h> # include <libopencm3/stm32/f4/hash.h>
#else #else
# error "hash processor is supported only in stm32f21, stm32f41 and stm32f43 families." # error "hash processor is supported only" \
"in stm32f21, stm32f41 and stm32f43 families."
#endif #endif

3
include/libopencm3/stm32/l1/crc.h
View File

@ -1,6 +1,7 @@
/** @defgroup crc_defines CRC Defines /** @defgroup crc_defines CRC Defines
@brief <b>libopencm3 Defined Constants and Types for the STM32L1xx CRC Generator </b> @brief <b>libopencm3 Defined Constants and Types for the STM32L1xx CRC
Generator </b>
@ingroup STM32L1xx_defines @ingroup STM32L1xx_defines

6
include/libopencm3/stm32/l1/dma.h
View File

@ -6,8 +6,10 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2011 Fergus Noble <fergusnoble@gmail.com> @author @htmlonly &copy; @endhtmlonly 2011
@author @htmlonly &copy; @endhtmlonly 2012 Ken Sarkies <ksarkies@internode.on.net> Fergus Noble <fergusnoble@gmail.com>
@author @htmlonly &copy; @endhtmlonly 2012
Ken Sarkies <ksarkies@internode.on.net>
@date 18 October 2012 @date 18 October 2012

3
include/libopencm3/stm32/l1/flash.h
View File

@ -20,7 +20,8 @@
*/ */
/* /*
* All extracted from PM0062 rev2, L15xx and L16xx Flash/EEPROM programming manual * All extracted from PM0062 rev2, L15xx and L16xx Flash/EEPROM programming
* manual.
*/ */
#ifndef LIBOPENCM3_FLASH_H #ifndef LIBOPENCM3_FLASH_H

2
include/libopencm3/stm32/l1/gpio.h
View File

@ -171,7 +171,7 @@ LGPL License Terms @ref lgpl_license
#define GPIO_OTYPE_OD 0x1 #define GPIO_OTYPE_OD 0x1
/**@}*/ /**@}*/
/* Output speed values */ /* Output speed values */
#define GPIO_OSPEED(n, speed) (speed << (2 * (n))) #define GPIO_OSPEED(n, speed) (speed << (2 * (n)))
#define GPIO_OSPEED_MASK(n) (0x3 << (2 * (n))) #define GPIO_OSPEED_MASK(n) (0x3 << (2 * (n)))
/** @defgroup gpio_speed GPIO Output Pin Speed /** @defgroup gpio_speed GPIO Output Pin Speed

3
include/libopencm3/stm32/l1/iwdg.h
View File

@ -1,6 +1,7 @@
/** @defgroup iwdg_defines IWDG Defines /** @defgroup iwdg_defines IWDG Defines
@brief <b>Defined Constants and Types for the STM32L1xx Independent Watchdog Timer</b> @brief <b>Defined Constants and Types for the STM32L1xx Independent Watchdog
Timer</b>
@ingroup STM32L1xx_defines @ingroup STM32L1xx_defines

9
include/libopencm3/stm32/l1/rcc.h
View File

@ -6,9 +6,12 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2009 Federico Ruiz-Ugalde \<memeruiz at gmail dot com\> @author @htmlonly &copy; @endhtmlonly 2009
@author @htmlonly &copy; @endhtmlonly 2009 Uwe Hermann <uwe@hermann-uwe.de> Federico Ruiz-Ugalde \<memeruiz at gmail dot com\>
@author @htmlonly &copy; @endhtmlonly 2012 Karl Palsson <karlp@tweak.net.au> @author @htmlonly &copy; @endhtmlonly 2009
Uwe Hermann <uwe@hermann-uwe.de>
@author @htmlonly &copy; @endhtmlonly 2012
Karl Palsson <karlp@tweak.net.au>
@date 11 November 2012 @date 11 November 2012

3
include/libopencm3/stm32/l1/timer.h
View File

@ -51,7 +51,8 @@ LGPL License Terms @ref lgpl_license
/* ITR1_RMP */ /* ITR1_RMP */
/****************************************************************************/ /****************************************************************************/
/** @defgroup tim2_opt_trigger_remap TIM2_OR Timer 2 Option Register Internal Trigger 1 Remap /** @defgroup tim2_opt_trigger_remap TIM2_OR Timer 2 Option Register Internal
Trigger 1 Remap
@ingroup timer_defines @ingroup timer_defines
@{*/ @{*/

29
include/libopencm3/stm32/otg_fs.h
View File

@ -39,7 +39,8 @@
#define OTG_FS_GCCFG MMIO32(USB_OTG_FS_BASE + 0x038) #define OTG_FS_GCCFG MMIO32(USB_OTG_FS_BASE + 0x038)
#define OTG_FS_CID MMIO32(USB_OTG_FS_BASE + 0x03C) #define OTG_FS_CID MMIO32(USB_OTG_FS_BASE + 0x03C)
#define OTG_FS_HPTXFSIZ MMIO32(USB_OTG_FS_BASE + 0x100) #define OTG_FS_HPTXFSIZ MMIO32(USB_OTG_FS_BASE + 0x100)
#define OTG_FS_DIEPTXF(x) MMIO32(USB_OTG_FS_BASE + 0x104 + 4*(x-1)) #define OTG_FS_DIEPTXF(x) MMIO32(USB_OTG_FS_BASE + 0x104 + \
4*(x-1))
/* Host-mode Control and Status Registers */ /* Host-mode Control and Status Registers */
#define OTG_FS_HCFG MMIO32(USB_OTG_FS_BASE + 0x400) #define OTG_FS_HCFG MMIO32(USB_OTG_FS_BASE + 0x400)
@ -66,28 +67,36 @@
#define OTG_FS_DVBUSPULSE MMIO32(USB_OTG_FS_BASE + 0x82C) #define OTG_FS_DVBUSPULSE MMIO32(USB_OTG_FS_BASE + 0x82C)
#define OTG_FS_DIEPEMPMSK MMIO32(USB_OTG_FS_BASE + 0x834) #define OTG_FS_DIEPEMPMSK MMIO32(USB_OTG_FS_BASE + 0x834)
#define OTG_FS_DIEPCTL0 MMIO32(USB_OTG_FS_BASE + 0x900) #define OTG_FS_DIEPCTL0 MMIO32(USB_OTG_FS_BASE + 0x900)
#define OTG_FS_DIEPCTL(x) MMIO32(USB_OTG_FS_BASE + 0x900 + 0x20*(x)) #define OTG_FS_DIEPCTL(x) MMIO32(USB_OTG_FS_BASE + 0x900 + \
0x20*(x))
#define OTG_FS_DOEPCTL0 MMIO32(USB_OTG_FS_BASE + 0xB00) #define OTG_FS_DOEPCTL0 MMIO32(USB_OTG_FS_BASE + 0xB00)
#define OTG_FS_DOEPCTL(x) MMIO32(USB_OTG_FS_BASE + 0xB00 + 0x20*(x)) #define OTG_FS_DOEPCTL(x) MMIO32(USB_OTG_FS_BASE + 0xB00 + \
#define OTG_FS_DIEPINT(x) MMIO32(USB_OTG_FS_BASE + 0x908 + 0x20*(x)) 0x20*(x))
#define OTG_FS_DOEPINT(x) MMIO32(USB_OTG_FS_BASE + 0xB08 + 0x20*(x)) #define OTG_FS_DIEPINT(x) MMIO32(USB_OTG_FS_BASE + 0x908 + \
0x20*(x))
#define OTG_FS_DOEPINT(x) MMIO32(USB_OTG_FS_BASE + 0xB08 + \
0x20*(x))
#define OTG_FS_DIEPTSIZ0 MMIO32(USB_OTG_FS_BASE + 0x910) #define OTG_FS_DIEPTSIZ0 MMIO32(USB_OTG_FS_BASE + 0x910)
#define OTG_FS_DOEPTSIZ0 MMIO32(USB_OTG_FS_BASE + 0xB10) #define OTG_FS_DOEPTSIZ0 MMIO32(USB_OTG_FS_BASE + 0xB10)
#define OTG_FS_DIEPTSIZ(x) MMIO32(USB_OTG_FS_BASE + 0x910 + 0x20*(x)) #define OTG_FS_DIEPTSIZ(x) MMIO32(USB_OTG_FS_BASE + 0x910 + \
#define OTG_FS_DTXFSTS(x) MMIO32(USB_OTG_FS_BASE + 0x918 + 0x20*(x)) 0x20*(x))
#define OTG_FS_DOEPTSIZ(x) MMIO32(USB_OTG_FS_BASE + 0xB10 + 0x20*(x)) #define OTG_FS_DTXFSTS(x) MMIO32(USB_OTG_FS_BASE + 0x918 + \
0x20*(x))
#define OTG_FS_DOEPTSIZ(x) MMIO32(USB_OTG_FS_BASE + 0xB10 + \
0x20*(x))
/* Power and clock gating control and status register */ /* Power and clock gating control and status register */
#define OTG_FS_PCGCCTL MMIO32(USB_OTG_FS_BASE + 0xE00) #define OTG_FS_PCGCCTL MMIO32(USB_OTG_FS_BASE + 0xE00)
/* Data FIFO */ /* Data FIFO */
#define OTG_FS_FIFO(x) ((volatile u32*)(USB_OTG_FS_BASE + (((x) + 1) << 12))) #define OTG_FS_FIFO(x) ((volatile u32*)(USB_OTG_FS_BASE + \
(((x) + 1) << 12)))
/* Global CSRs */ /* Global CSRs */
/* OTG_FS USB control registers (OTG_HS_GOTGCTL) */ /* OTG_FS USB control registers (OTG_HS_GOTGCTL) */
#define OTG_FS_GOTGCTL_BSVLD (1 << 19) #define OTG_FS_GOTGCTL_BSVLD (1 << 19)
#define OTG_FS_GOTGCTL_ASVLD (1 << 18) #define OTG_FS_GOTGCTL_ASVLD (1 << 18)
#define OTG_FS_GOTGCTL_DBCT (1 << 17) #define OTG_FS_GOTGCTL_DBCT (1 << 17)
#define OTG_FS_GOTGCTL_CIDSTS (1 << 16) #define OTG_FS_GOTGCTL_CIDSTS (1 << 16)
#define OTG_FS_GOTGCTL_DHNPEN (1 << 11) #define OTG_FS_GOTGCTL_DHNPEN (1 << 11)
#define OTG_FS_GOTGCTL_HSHNPEN (1 << 10) #define OTG_FS_GOTGCTL_HSHNPEN (1 << 10)

11
include/libopencm3/stm32/otg_hs.h
View File

@ -135,21 +135,24 @@
#define OTG_HS_DOEPINT(x) MMIO32(USB_OTG_HS_BASE + OTG_DOEPINT(x)) #define OTG_HS_DOEPINT(x) MMIO32(USB_OTG_HS_BASE + OTG_DOEPINT(x))
#define OTG_HS_DIEPTSIZ0 MMIO32(USB_OTG_HS_BASE + OTG_DIEPTSIZ0) #define OTG_HS_DIEPTSIZ0 MMIO32(USB_OTG_HS_BASE + OTG_DIEPTSIZ0)
#define OTG_HS_DOEPTSIZ0 MMIO32(USB_OTG_HS_BASE + OTG_DOEPTSIZ0) #define OTG_HS_DOEPTSIZ0 MMIO32(USB_OTG_HS_BASE + OTG_DOEPTSIZ0)
#define OTG_HS_DIEPTSIZ(x) MMIO32(USB_OTG_HS_BASE + OTG_DIEPTSIZ(x))) #define OTG_HS_DIEPTSIZ(x) MMIO32(USB_OTG_HS_BASE + \
OTG_DIEPTSIZ(x))
#define OTG_HS_DTXFSTS(x) MMIO32(USB_OTG_HS_BASE + OTG_DTXFSTS(x)) #define OTG_HS_DTXFSTS(x) MMIO32(USB_OTG_HS_BASE + OTG_DTXFSTS(x))
#define OTG_HS_DOEPTSIZ(x) MMIO32(USB_OTG_HS_BASE + OTG_DOEPTSIZ(x)) #define OTG_HS_DOEPTSIZ(x) MMIO32(USB_OTG_HS_BASE + \
OTG_DOEPTSIZ(x))
/* Power and clock gating control and status register */ /* Power and clock gating control and status register */
#define OTG_HS_PCGCCTL MMIO32(USB_OTG_HS_BASE + OTG_PCGCCTL) #define OTG_HS_PCGCCTL MMIO32(USB_OTG_HS_BASE + OTG_PCGCCTL)
/* Data FIFO */ /* Data FIFO */
#define OTG_HS_FIFO(x) ((volatile u32*)(USB_OTG_HS_BASE + OTG_FIFO(x))) #define OTG_HS_FIFO(x) ((volatile u32*)(USB_OTG_HS_BASE + \
OTG_FIFO(x)))
/* Global CSRs */ /* Global CSRs */
/* OTG_HS USB control registers (OTG_FS_GOTGCTL) */ /* OTG_HS USB control registers (OTG_FS_GOTGCTL) */
#define OTG_HS_GOTGCTL_BSVLD (1 << 19) #define OTG_HS_GOTGCTL_BSVLD (1 << 19)
#define OTG_HS_GOTGCTL_ASVLD (1 << 18) #define OTG_HS_GOTGCTL_ASVLD (1 << 18)
#define OTG_HS_GOTGCTL_DBCT (1 << 17) #define OTG_HS_GOTGCTL_DBCT (1 << 17)
#define OTG_HS_GOTGCTL_CIDSTS (1 << 16) #define OTG_HS_GOTGCTL_CIDSTS (1 << 16)
#define OTG_HS_GOTGCTL_DHNPEN (1 << 11) #define OTG_HS_GOTGCTL_DHNPEN (1 << 11)
#define OTG_HS_GOTGCTL_HSHNPEN (1 << 10) #define OTG_HS_GOTGCTL_HSHNPEN (1 << 10)

2
include/libopencm3/stm32/syscfg.h
View File

@ -22,7 +22,7 @@
#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/memorymap.h>
/* --- SYSCFG registers ------------------------------------------------------ */ /* --- SYSCFG registers ---------------------------------------------------- */
#define SYSCFG_MEMRM MMIO32(SYSCFG_BASE + 0x00) #define SYSCFG_MEMRM MMIO32(SYSCFG_BASE + 0x00)

2
include/libopencm3/stm32/tools.h
View File

@ -59,6 +59,6 @@ do { \
toggle_mask ^= bit_selector; \ toggle_mask ^= bit_selector; \
} \ } \
SET_REG(REG, toggle_mask); \ SET_REG(REG, toggle_mask); \
} while(0) } while (0)
#endif #endif

13
include/libopencm3/usb/cdc.h
View File

@ -6,7 +6,8 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2010 Gareth McMullin <gareth@blacksphere.co.nz> @author @htmlonly &copy; @endhtmlonly 2010
Gareth McMullin <gareth@blacksphere.co.nz>
@date 10 March 2013 @date 10 March 2013
@ -87,7 +88,7 @@ struct usb_cdc_union_descriptor {
u8 bControlInterface; u8 bControlInterface;
u8 bSubordinateInterface0; u8 bSubordinateInterface0;
/* ... */ /* ... */
} __attribute__((packed)); } __packed;
/* Definitions for Abstract Control Model devices from: /* Definitions for Abstract Control Model devices from:
@ -102,7 +103,7 @@ struct usb_cdc_call_management_descriptor {
u8 bDescriptorSubtype; u8 bDescriptorSubtype;
u8 bmCapabilities; u8 bmCapabilities;
u8 bDataInterface; u8 bDataInterface;
} __attribute__((packed)); } __packed;
/* Table 4: Abstract Control Management Functional Descriptor */ /* Table 4: Abstract Control Management Functional Descriptor */
struct usb_cdc_acm_descriptor { struct usb_cdc_acm_descriptor {
@ -110,7 +111,7 @@ struct usb_cdc_acm_descriptor {
u8 bDescriptorType; u8 bDescriptorType;
u8 bDescriptorSubtype; u8 bDescriptorSubtype;
u8 bmCapabilities; u8 bmCapabilities;
} __attribute__((packed)); } __packed;
/* Table 13: Class-Specific Request Codes for PSTN subclasses */ /* Table 13: Class-Specific Request Codes for PSTN subclasses */
/* ... */ /* ... */
@ -125,7 +126,7 @@ struct usb_cdc_line_coding {
u8 bCharFormat; u8 bCharFormat;
u8 bParityType; u8 bParityType;
u8 bDataBits; u8 bDataBits;
} __attribute__((packed)); } __packed;
/* Table 30: Class-Specific Notification Codes for PSTN subclasses */ /* Table 30: Class-Specific Notification Codes for PSTN subclasses */
/* ... */ /* ... */
@ -139,7 +140,7 @@ struct usb_cdc_notification {
u16 wValue; u16 wValue;
u16 wIndex; u16 wIndex;
u16 wLength; u16 wLength;
} __attribute__((packed)); } __packed;
#endif #endif

5
include/libopencm3/usb/dfu.h
View File

@ -6,7 +6,8 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2010 Gareth McMullin <gareth@blacksphere.co.nz> @author @htmlonly &copy; @endhtmlonly 2010
Gareth McMullin <gareth@blacksphere.co.nz>
@date 10 March 2013 @date 10 March 2013
@ -93,7 +94,7 @@ struct usb_dfu_descriptor {
u16 wDetachTimeout; u16 wDetachTimeout;
u16 wTransferSize; u16 wTransferSize;
u16 bcdDFUVersion; u16 bcdDFUVersion;
} __attribute__((packed)); } __packed;
#endif #endif

5
include/libopencm3/usb/hid.h
View File

@ -6,7 +6,8 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2010 Gareth McMullin <gareth@blacksphere.co.nz> @author @htmlonly &copy; @endhtmlonly 2010
Gareth McMullin <gareth@blacksphere.co.nz>
@date 10 March 2013 @date 10 March 2013
@ -50,7 +51,7 @@ struct usb_hid_descriptor {
u16 bcdHID; u16 bcdHID;
u8 bCountryCode; u8 bCountryCode;
u8 bNumDescriptors; u8 bNumDescriptors;
} __attribute__((packed)); } __packed;
#endif #endif

13
include/libopencm3/usb/usbd.h
View File

@ -6,7 +6,8 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2010 Gareth McMullin <gareth@blacksphere.co.nz> @author @htmlonly &copy; @endhtmlonly 2010
Gareth McMullin <gareth@blacksphere.co.nz>
@date 10 March 2013 @date 10 March 2013
@ -58,11 +59,11 @@ extern const usbd_driver stm32f207_usb_driver;
#define otghs_usb_driver stm32f207_usb_driver #define otghs_usb_driver stm32f207_usb_driver
/* <usb.c> */ /* <usb.c> */
extern usbd_device *usbd_init(const usbd_driver *driver, extern usbd_device * usbd_init(const usbd_driver *driver,
const struct usb_device_descriptor *dev, const struct usb_device_descriptor *dev,
const struct usb_config_descriptor *conf, const struct usb_config_descriptor *conf,
const char **strings, int num_strings, const char **strings, int num_strings,
u8 *control_buffer, u16 control_buffer_size); u8 *control_buffer, u16 control_buffer_size);
extern void usbd_register_reset_callback(usbd_device *usbd_dev, extern void usbd_register_reset_callback(usbd_device *usbd_dev,
void (*callback)(void)); void (*callback)(void));

24
include/libopencm3/usb/usbstd.h
View File

@ -1,12 +1,14 @@
/** @defgroup usb_type_defines USB Standard Structure Definitions /** @defgroup usb_type_defines USB Standard Structure Definitions
@brief <b>Defined Constants and Types for the USB Standard Structure Definitions</b> @brief <b>Defined Constants and Types for the USB Standard Structure
Definitions</b>
@ingroup USB_defines @ingroup USB_defines
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2010 Gareth McMullin <gareth@blacksphere.co.nz> @author @htmlonly &copy; @endhtmlonly 2010
Gareth McMullin <gareth@blacksphere.co.nz>
@date 10 March 2013 @date 10 March 2013
@ -57,10 +59,10 @@ struct usb_setup_data {
u16 wValue; u16 wValue;
u16 wIndex; u16 wIndex;
u16 wLength; u16 wLength;
} __attribute__((packed)); } __packed;
/* Class Definition */ /* Class Definition */
#define USB_CLASS_VENDOR 0xFF #define USB_CLASS_VENDOR 0xFF
/* bmRequestType bit definitions */ /* bmRequestType bit definitions */
#define USB_REQ_TYPE_IN 0x80 #define USB_REQ_TYPE_IN 0x80
@ -129,7 +131,7 @@ struct usb_device_descriptor {
u8 iProduct; u8 iProduct;
u8 iSerialNumber; u8 iSerialNumber;
u8 bNumConfigurations; u8 bNumConfigurations;
} __attribute__((packed)); } __packed;
#define USB_DT_DEVICE_SIZE sizeof(struct usb_device_descriptor) #define USB_DT_DEVICE_SIZE sizeof(struct usb_device_descriptor)
@ -146,7 +148,7 @@ struct usb_device_qualifier_descriptor {
u8 bMaxPacketSize0; u8 bMaxPacketSize0;
u8 bNumConfigurations; u8 bNumConfigurations;
u8 bReserved; u8 bReserved;
} __attribute__((packed)); } __packed;
/* USB Standard Configuration Descriptor - Table 9-10 */ /* USB Standard Configuration Descriptor - Table 9-10 */
struct usb_config_descriptor { struct usb_config_descriptor {
@ -165,7 +167,7 @@ struct usb_config_descriptor {
const struct usb_iface_assoc_descriptor *iface_assoc; const struct usb_iface_assoc_descriptor *iface_assoc;
const struct usb_interface_descriptor *altsetting; const struct usb_interface_descriptor *altsetting;
} *interface; } *interface;
} __attribute__((packed)); } __packed;
#define USB_DT_CONFIGURATION_SIZE 9 #define USB_DT_CONFIGURATION_SIZE 9
/* USB Configuration Descriptor bmAttributes bit definitions */ /* USB Configuration Descriptor bmAttributes bit definitions */
@ -192,7 +194,7 @@ struct usb_interface_descriptor {
const struct usb_endpoint_descriptor *endpoint; const struct usb_endpoint_descriptor *endpoint;
const void *extra; const void *extra;
int extralen; int extralen;
} __attribute__((packed)); } __packed;
#define USB_DT_INTERFACE_SIZE 9 #define USB_DT_INTERFACE_SIZE 9
/* USB Standard Endpoint Descriptor - Table 9-13 */ /* USB Standard Endpoint Descriptor - Table 9-13 */
@ -203,7 +205,7 @@ struct usb_endpoint_descriptor {
u8 bmAttributes; u8 bmAttributes;
u16 wMaxPacketSize; u16 wMaxPacketSize;
u8 bInterval; u8 bInterval;
} __attribute__((packed)); } __packed;
#define USB_DT_ENDPOINT_SIZE sizeof(struct usb_endpoint_descriptor) #define USB_DT_ENDPOINT_SIZE sizeof(struct usb_endpoint_descriptor)
/* USB Endpoint Descriptor bmAttributes bit definitions */ /* USB Endpoint Descriptor bmAttributes bit definitions */
@ -228,7 +230,7 @@ struct usb_string_descriptor {
u8 bLength; u8 bLength;
u8 bDescriptorType; u8 bDescriptorType;
u16 wData[]; u16 wData[];
} __attribute__((packed)); } __packed;
/* From ECN: Interface Association Descriptors, Table 9-Z */ /* From ECN: Interface Association Descriptors, Table 9-Z */
struct usb_iface_assoc_descriptor { struct usb_iface_assoc_descriptor {
@ -240,7 +242,7 @@ struct usb_iface_assoc_descriptor {
u8 bFunctionSubClass; u8 bFunctionSubClass;
u8 bFunctionProtocol; u8 bFunctionProtocol;
u8 iFunction; u8 iFunction;
} __attribute__((packed)); } __packed;
#define USB_DT_INTERFACE_ASSOCIATION_SIZE \ #define USB_DT_INTERFACE_ASSOCIATION_SIZE \
sizeof(struct usb_iface_assoc_descriptor) sizeof(struct usb_iface_assoc_descriptor)

26
include/libopencmsis/core_cm3.h
View File

@ -4,7 +4,8 @@
* particularly unimplemented features are FIXME'd extra * particularly unimplemented features are FIXME'd extra
* */ * */
/* the original core_cm3.h is nonfree by arm; this provides libopencm3 variant of the symbols efm32lib needs of CMSIS. */ /* the original core_cm3.h is nonfree by arm; this provides libopencm3 variant
* of the symbols efm32lib needs of CMSIS. */
#ifndef OPENCMSIS_CORECM3_H #ifndef OPENCMSIS_CORECM3_H
#define OPENCMSIS_CORECM3_H #define OPENCMSIS_CORECM3_H
@ -35,8 +36,7 @@
/* structure as in, for example, /* structure as in, for example,
* DeviceSupport/EnergyMicro/EFM32/efm32tg840f32.h, data from * DeviceSupport/EnergyMicro/EFM32/efm32tg840f32.h, data from
* libopencm3/cm3/scb.h. FIXME incomplete. */ * libopencm3/cm3/scb.h. FIXME incomplete. */
typedef struct typedef struct {
{
__IO uint32_t CPUID; __IO uint32_t CPUID;
__IO uint32_t ICSR; __IO uint32_t ICSR;
__IO uint32_t VTOR; __IO uint32_t VTOR;
@ -55,12 +55,13 @@ typedef struct
/* needed by efm32_cmu.h, probably it's just what gcc provides anyway */ /* needed by efm32_cmu.h, probably it's just what gcc provides anyway */
#define __CLZ(div) __builtin_clz(div) #define __CLZ(div) __builtin_clz(div)
/* needed by efm32_aes.c. __builtin_bswap32 does the same thing as the rev instruction according to https://bugzilla.mozilla.org/show_bug.cgi?id=600106 */ /* needed by efm32_aes.c. __builtin_bswap32 does the same thing as the rev
* instruction according to https://bugzilla.mozilla.org/show_bug.cgi?id=600106
*/
#define __REV(x) __builtin_bswap32(x) #define __REV(x) __builtin_bswap32(x)
/* stubs for efm32_dbg.h */ /* stubs for efm32_dbg.h */
typedef struct typedef struct {
{
uint32_t DHCSR; uint32_t DHCSR;
uint32_t DEMCR; /* needed by efm32tg stk trace.c */ uint32_t DEMCR; /* needed by efm32tg stk trace.c */
} CoreDebug_TypeDef; } CoreDebug_TypeDef;
@ -94,8 +95,7 @@ static inline void NVIC_DisableIRQ(uint8_t irqn)
#define SCB_SHCSR_MEMFAULTENA_Msk 0 #define SCB_SHCSR_MEMFAULTENA_Msk 0
typedef struct typedef struct {
{
uint32_t CTRL; uint32_t CTRL;
uint32_t RNR; uint32_t RNR;
uint32_t RBAR; uint32_t RBAR;
@ -133,8 +133,7 @@ typedef struct
* */ * */
/* from d0002_efm32_cortex-m3_reference_manual.pdf section 4.4 */ /* from d0002_efm32_cortex-m3_reference_manual.pdf section 4.4 */
typedef struct typedef struct {
{
uint32_t CTRL; uint32_t CTRL;
uint32_t LOAD; uint32_t LOAD;
uint32_t VAL; uint32_t VAL;
@ -146,7 +145,9 @@ static inline uint32_t SysTick_Config(uint32_t n_ticks)
{ {
/* constant from systick_set_reload -- as this returns something that's /* constant from systick_set_reload -- as this returns something that's
* not void, this is the only possible error condition */ * not void, this is the only possible error condition */
if (n_ticks & ~0x00FFFFFF) return 1; if (n_ticks & ~0x00FFFFFF) {
return 1;
}
systick_set_reload(n_ticks); systick_set_reload(n_ticks);
systick_set_clocksource(true); systick_set_clocksource(true);
@ -157,8 +158,7 @@ static inline uint32_t SysTick_Config(uint32_t n_ticks)
} }
/* stubs for efm32tg stk trace.c */ /* stubs for efm32tg stk trace.c */
typedef struct typedef struct {
{
uint32_t LAR; uint32_t LAR;
uint32_t TCR; uint32_t TCR;
} ITM_TypeDef; } ITM_TypeDef;

2
lib/cm3/assert.c
View File

@ -21,7 +21,7 @@
void __attribute__((weak)) cm3_assert_failed(void) void __attribute__((weak)) cm3_assert_failed(void)
{ {
while(1); while (1);
} }
void __attribute__((weak)) cm3_assert_failed_verbose( void __attribute__((weak)) cm3_assert_failed_verbose(

39
lib/cm3/nvic.c
View File

@ -45,7 +45,7 @@ LGPL License Terms @ref lgpl_license
#include <libopencm3/cm3/nvic.h> #include <libopencm3/cm3/nvic.h>
#include <libopencm3/cm3/scs.h> #include <libopencm3/cm3/scs.h>
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief NVIC Enable Interrupt /** @brief NVIC Enable Interrupt
Enables a user interrupt. Enables a user interrupt.
@ -58,7 +58,7 @@ void nvic_enable_irq(u8 irqn)
NVIC_ISER(irqn / 32) = (1 << (irqn % 32)); NVIC_ISER(irqn / 32) = (1 << (irqn % 32));
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief NVIC Disable Interrupt /** @brief NVIC Disable Interrupt
Disables a user interrupt. Disables a user interrupt.
@ -71,7 +71,7 @@ void nvic_disable_irq(u8 irqn)
NVIC_ICER(irqn / 32) = (1 << (irqn % 32)); NVIC_ICER(irqn / 32) = (1 << (irqn % 32));
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief NVIC Return Pending Interrupt /** @brief NVIC Return Pending Interrupt
True if the interrupt has occurred and is waiting for service. True if the interrupt has occurred and is waiting for service.
@ -85,7 +85,7 @@ u8 nvic_get_pending_irq(u8 irqn)
return NVIC_ISPR(irqn / 32) & (1 << (irqn % 32)) ? 1 : 0; return NVIC_ISPR(irqn / 32) & (1 << (irqn % 32)) ? 1 : 0;
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief NVIC Set Pending Interrupt /** @brief NVIC Set Pending Interrupt
Force a user interrupt to a pending state. This has no effect if the interrupt Force a user interrupt to a pending state. This has no effect if the interrupt
@ -99,7 +99,7 @@ void nvic_set_pending_irq(u8 irqn)
NVIC_ISPR(irqn / 32) = (1 << (irqn % 32)); NVIC_ISPR(irqn / 32) = (1 << (irqn % 32));
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief NVIC Clear Pending Interrupt /** @brief NVIC Clear Pending Interrupt
Force remove a user interrupt from a pending state. This has no effect if the Force remove a user interrupt from a pending state. This has no effect if the
@ -113,7 +113,7 @@ void nvic_clear_pending_irq(u8 irqn)
NVIC_ICPR(irqn / 32) = (1 << (irqn % 32)); NVIC_ICPR(irqn / 32) = (1 << (irqn % 32));
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief NVIC Return Active Interrupt /** @brief NVIC Return Active Interrupt
Interrupt has occurred and is currently being serviced. Interrupt has occurred and is currently being serviced.
@ -127,7 +127,7 @@ u8 nvic_get_active_irq(u8 irqn)
return NVIC_IABR(irqn / 32) & (1 << (irqn % 32)) ? 1 : 0; return NVIC_IABR(irqn / 32) & (1 << (irqn % 32)) ? 1 : 0;
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief NVIC Return Enabled Interrupt /** @brief NVIC Return Enabled Interrupt
@param[in] irqn Unsigned int8. Interrupt number @ref nvic_stm32f1_userint @param[in] irqn Unsigned int8. Interrupt number @ref nvic_stm32f1_userint
@ -139,13 +139,14 @@ u8 nvic_get_irq_enabled(u8 irqn)
return NVIC_ISER(irqn / 32) & (1 << (irqn % 32)) ? 1 : 0; return NVIC_ISER(irqn / 32) & (1 << (irqn % 32)) ? 1 : 0;
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief NVIC Set Interrupt Priority /** @brief NVIC Set Interrupt Priority
There are 16 priority levels only, given by the upper four bits of the priority There are 16 priority levels only, given by the upper four bits of the priority
byte, as required by ARM standards. The priority levels are interpreted according byte, as required by ARM standards. The priority levels are interpreted
to the pre-emptive priority grouping set in the SCB Application Interrupt and Reset according to the pre-emptive priority grouping set in the SCB Application
Control Register (SCB_AIRCR), as done in @ref scb_set_priority_grouping. Interrupt and Reset Control Register (SCB_AIRCR), as done in @ref
scb_set_priority_grouping.
@param[in] irqn Unsigned int8. Interrupt number @ref nvic_stm32f1_userint @param[in] irqn Unsigned int8. Interrupt number @ref nvic_stm32f1_userint
@param[in] priority Unsigned int8. Interrupt priority (0 ... 255 in steps of 16) @param[in] priority Unsigned int8. Interrupt priority (0 ... 255 in steps of 16)
@ -156,29 +157,29 @@ void nvic_set_priority(u8 irqn, u8 priority)
/* code from lpc43xx/nvic.c -- this is quite a hack and alludes to the /* code from lpc43xx/nvic.c -- this is quite a hack and alludes to the
* negative interrupt numbers assigned to the system interrupts. better * negative interrupt numbers assigned to the system interrupts. better
* handling would mean signed integers. */ * handling would mean signed integers. */
if(irqn>=NVIC_IRQ_COUNT) if (irqn >= NVIC_IRQ_COUNT) {
{
/* Cortex-M system interrupts */ /* Cortex-M system interrupts */
SCS_SHPR( (irqn&0xF)-4 ) = priority; SCS_SHPR((irqn & 0xF) - 4) = priority;
}else } else {
{
/* Device specific interrupts */ /* Device specific interrupts */
NVIC_IPR(irqn) = priority; NVIC_IPR(irqn) = priority;
} }
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief NVIC Software Trigger Interrupt /** @brief NVIC Software Trigger Interrupt
Generate an interrupt from software. This has no effect for unprivileged access Generate an interrupt from software. This has no effect for unprivileged access
unless the privilege level has been elevated through the System Control Registers. unless the privilege level has been elevated through the System Control
Registers.
@param[in] irqn Unsigned int16. Interrupt number (0 ... 239) @param[in] irqn Unsigned int16. Interrupt number (0 ... 239)
*/ */
void nvic_generate_software_interrupt(u16 irqn) void nvic_generate_software_interrupt(u16 irqn)
{ {
if (irqn <= 239) if (irqn <= 239) {
NVIC_STIR |= irqn; NVIC_STIR |= irqn;
}
} }
/**@}*/ /**@}*/

4
lib/cm3/scb.c
View File

@ -25,14 +25,14 @@ void scb_reset_core(void)
{ {
SCB_AIRCR = SCB_AIRCR_VECTKEY | SCB_AIRCR_VECTRESET; SCB_AIRCR = SCB_AIRCR_VECTKEY | SCB_AIRCR_VECTRESET;
while(1); while (1);
} }
void scb_reset_system(void) void scb_reset_system(void)
{ {
SCB_AIRCR = SCB_AIRCR_VECTKEY | SCB_AIRCR_SYSRESETREQ; SCB_AIRCR = SCB_AIRCR_VECTKEY | SCB_AIRCR_SYSRESETREQ;
while(1); while (1);
} }
void scb_set_priority_grouping(u32 prigroup) void scb_set_priority_grouping(u32 prigroup)

12
lib/cm3/sync.c
View File

@ -19,18 +19,18 @@
#include <libopencm3/cm3/sync.h> #include <libopencm3/cm3/sync.h>
u32 __ldrex(volatile u32* addr) u32 __ldrex(volatile u32 *addr)
{ {
u32 res; u32 res;
__asm__ volatile ("ldrex %0, [%1]" : "=r" (res) : "r" (addr)); __asm__ volatile ("ldrex %0, [%1]" : "=r" (res) : "r" (addr));
return res; return res;
} }
u32 __strex(u32 val, volatile u32* addr) u32 __strex(u32 val, volatile u32 *addr)
{ {
u32 res; u32 res;
__asm__ volatile ("strex %0, %2, [%1]" : __asm__ volatile ("strex %0, %2, [%1]"
"=&r" (res) : "r" (addr), "r" (val)); : "=&r" (res) : "r" (addr), "r" (val));
return res; return res;
} }
@ -39,7 +39,7 @@ void __dmb()
__asm__ volatile ("dmb"); __asm__ volatile ("dmb");
} }
void mutex_lock(mutex_t* m) void mutex_lock(mutex_t *m)
{ {
u32 status = 0; u32 status = 0;
@ -57,7 +57,7 @@ void mutex_lock(mutex_t* m)
__dmb(); __dmb();
} }
void mutex_unlock(mutex_t* m) void mutex_unlock(mutex_t *m)
{ {
__dmb(); __dmb();

38
lib/cm3/systick.c
View File

@ -40,7 +40,7 @@ LGPL License Terms @ref lgpl_license
/**@{*/ /**@{*/
#include <libopencm3/cm3/systick.h> #include <libopencm3/cm3/systick.h>
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief SysTick Set the Automatic Reload Value. /** @brief SysTick Set the Automatic Reload Value.
The counter is set to the reload value when the counter starts and after it The counter is set to the reload value when the counter starts and after it
@ -54,7 +54,7 @@ void systick_set_reload(u32 value)
STK_LOAD = (value & 0x00FFFFFF); STK_LOAD = (value & 0x00FFFFFF);
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief SysTick Read the Automatic Reload Value. /** @brief SysTick Read the Automatic Reload Value.
@returns 24 bit reload value as u32. @returns 24 bit reload value as u32.
@ -62,10 +62,10 @@ void systick_set_reload(u32 value)
u32 systick_get_reload(void) u32 systick_get_reload(void)
{ {
return (STK_LOAD & 0x00FFFFFF); return STK_LOAD & 0x00FFFFFF;
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief Get the current SysTick counter value. /** @brief Get the current SysTick counter value.
@returns 24 bit current value as u32. @returns 24 bit current value as u32.
@ -73,10 +73,10 @@ u32 systick_get_reload(void)
u32 systick_get_value(void) u32 systick_get_value(void)
{ {
return (STK_VAL & 0x00FFFFFF); return STK_VAL & 0x00FFFFFF;
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief Set the SysTick Clock Source. /** @brief Set the SysTick Clock Source.
The clock source can be either the AHB clock or the same clock divided by 8. The clock source can be either the AHB clock or the same clock divided by 8.
@ -86,11 +86,12 @@ The clock source can be either the AHB clock or the same clock divided by 8.
void systick_set_clocksource(u8 clocksource) void systick_set_clocksource(u8 clocksource)
{ {
if (clocksource < 2) if (clocksource < 2) {
STK_CTRL |= (clocksource << STK_CTRL_CLKSOURCE_LSB); STK_CTRL |= (clocksource << STK_CTRL_CLKSOURCE_LSB);
}
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief Enable SysTick Interrupt. /** @brief Enable SysTick Interrupt.
*/ */
@ -100,7 +101,7 @@ void systick_interrupt_enable(void)
STK_CTRL |= STK_CTRL_TICKINT; STK_CTRL |= STK_CTRL_TICKINT;
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief Disable SysTick Interrupt. /** @brief Disable SysTick Interrupt.
*/ */
@ -110,7 +111,7 @@ void systick_interrupt_disable(void)
STK_CTRL &= ~STK_CTRL_TICKINT; STK_CTRL &= ~STK_CTRL_TICKINT;
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief Enable SysTick Counter. /** @brief Enable SysTick Counter.
*/ */
@ -120,7 +121,7 @@ void systick_counter_enable(void)
STK_CTRL |= STK_CTRL_ENABLE; STK_CTRL |= STK_CTRL_ENABLE;
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief Disable SysTick Counter. /** @brief Disable SysTick Counter.
*/ */
@ -130,31 +131,32 @@ void systick_counter_disable(void)
STK_CTRL &= ~STK_CTRL_ENABLE; STK_CTRL &= ~STK_CTRL_ENABLE;
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief SysTick Read the Counter Flag. /** @brief SysTick Read the Counter Flag.
The count flag is set when the timer count becomes zero, and is cleared when the The count flag is set when the timer count becomes zero, and is cleared when
flag is read. the flag is read.
@returns Boolean if flag set. @returns Boolean if flag set.
*/ */
u8 systick_get_countflag(void) u8 systick_get_countflag(void)
{ {
if (STK_CTRL & STK_CTRL_COUNTFLAG) if (STK_CTRL & STK_CTRL_COUNTFLAG) {
return 1; return 1;
else } else {
return 0; return 0;
}
} }
/*-----------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief SysTick Get Calibration Value /** @brief SysTick Get Calibration Value
@returns Current calibration value @returns Current calibration value
*/ */
u32 systick_get_calib(void) u32 systick_get_calib(void)
{ {
return (STK_CALIB&0x00FFFFFF); return STK_CALIB & 0x00FFFFFF;
} }
/**@}*/ /**@}*/

28
lib/cm3/vector.c
View File

@ -25,8 +25,6 @@
/* load the weak symbols for IRQ_HANDLERS */ /* load the weak symbols for IRQ_HANDLERS */
#include "../dispatch/vector_nvic.c" #include "../dispatch/vector_nvic.c"
#define WEAK __attribute__ ((weak))
/* Symbols exported by the linker script(s): */ /* Symbols exported by the linker script(s): */
extern unsigned _data_loadaddr, _data, _edata, _ebss, _stack; extern unsigned _data_loadaddr, _data, _edata, _ebss, _stack;
typedef void (*funcp_t) (void); typedef void (*funcp_t) (void);
@ -61,17 +59,23 @@ void WEAK __attribute__ ((naked)) reset_handler(void)
volatile unsigned *src, *dest; volatile unsigned *src, *dest;
funcp_t *fp; funcp_t *fp;
for (src = &_data_loadaddr, dest = &_data; dest < &_edata; src++, dest++) for (src = &_data_loadaddr, dest = &_data;
dest < &_edata;
src++, dest++) {
*dest = *src; *dest = *src;
}
while (dest < &_ebss) while (dest < &_ebss) {
*dest++ = 0; *dest++ = 0;
}
/* Constructors. */ /* Constructors. */
for (fp = &__preinit_array_start; fp < &__preinit_array_end; fp++) for (fp = &__preinit_array_start; fp < &__preinit_array_end; fp++) {
(*fp)(); (*fp)();
for (fp = &__init_array_start; fp < &__init_array_end; fp++) }
(*fp)(); for (fp = &__init_array_start; fp < &__init_array_end; fp++) {
(*fp)();
}
/* might be provided by platform specific vector.c */ /* might be provided by platform specific vector.c */
pre_main(); pre_main();
@ -80,13 +84,15 @@ void WEAK __attribute__ ((naked)) reset_handler(void)
main(); main();
/* Destructors. */ /* Destructors. */
for (fp = &__fini_array_start; fp < &__fini_array_end; fp++) for (fp = &__fini_array_start; fp < &__fini_array_end; fp++) {
(*fp)(); (*fp)();
}
} }
void blocking_handler(void) void blocking_handler(void)
{ {
while (1) ; while (1);
} }
void null_handler(void) void null_handler(void)

3
lib/dispatch/vector_nvic.c
View File

@ -33,7 +33,8 @@
# include "../lm3s/vector_nvic.c" # include "../lm3s/vector_nvic.c"
#else #else
# warning"no interrupts defined for chipset; not allocating space in the vector table" # warning "no interrupts defined for chipset;"\
"not allocating space in the vector table"
#define IRQ_HANDLERS #define IRQ_HANDLERS

3
lib/lm3s/gpio.c
View File

@ -6,7 +6,8 @@
@version 1.0.0 @version 1.0.0
@author @htmlonly &copy; @endhtmlonly 2011 Gareth McMullin <gareth@blacksphere.co.nz> @author @htmlonly &copy; @endhtmlonly 2011
Gareth McMullin <gareth@blacksphere.co.nz>
@date 10 March 2013 @date 10 March 2013

23
lib/lm4f/gpio.c
View File

@ -25,8 +25,10 @@
* *
* @version 1.0.0 * @version 1.0.0
* *
* @author @htmlonly &copy; @endhtmlonly 2011 Gareth McMullin <gareth@blacksphere.co.nz> * @author @htmlonly &copy; @endhtmlonly 2011
* @author @htmlonly &copy; @endhtmlonly 2013 Alexandru Gagniuc <mr.nuke.me@gmail.com> * Gareth McMullin <gareth@blacksphere.co.nz>
* @author @htmlonly &copy; @endhtmlonly 2013
* Alexandru Gagniuc <mr.nuke.me@gmail.com>
* *
* @date 16 March 2013 * @date 16 March 2013
* *
@ -268,17 +270,17 @@ void gpio_mode_setup(u32 gpioport, enum gpio_mode mode, enum gpio_pullup pullup,
void gpio_set_output_config(u32 gpioport, enum gpio_output_type otype, void gpio_set_output_config(u32 gpioport, enum gpio_output_type otype,
enum gpio_drive_strength drive, u8 gpios) enum gpio_drive_strength drive, u8 gpios)
{ {
if (otype == GPIO_OTYPE_OD) if (otype == GPIO_OTYPE_OD) {
GPIO_ODR(gpioport) |= gpios; GPIO_ODR(gpioport) |= gpios;
else } else {
GPIO_ODR(gpioport) &= ~gpios; GPIO_ODR(gpioport) &= ~gpios;
}
/* /*
* Setting a bit in the GPIO_DRxR register clears the corresponding bit * Setting a bit in the GPIO_DRxR register clears the corresponding bit
* in the other GPIO_DRyR registers, and vice-versa. * in the other GPIO_DRyR registers, and vice-versa.
*/ */
switch (drive) switch (drive) {
{
case GPIO_DRIVE_8MA_SLEW_CTL: case GPIO_DRIVE_8MA_SLEW_CTL:
GPIO_DR8R(gpioport) |= gpios; GPIO_DR8R(gpioport) |= gpios;
GPIO_SLR(gpioport) |= gpios; GPIO_SLR(gpioport) |= gpios;
@ -312,7 +314,7 @@ void gpio_set_output_config(u32 gpioport, enum gpio_output_type otype,
* *
* @param[in] gpioport GPIO block register address base @ref gpio_reg_base * @param[in] gpioport GPIO block register address base @ref gpio_reg_base
* @param[in] alt_func_num Pin alternate function number or 0 to disable the * @param[in] alt_func_num Pin alternate function number or 0 to disable the
* alternate function multiplexing. * alternate function multiplexing.
* @param[in] gpios @ref gpio_pin_id. Any combination of pins may be specified * @param[in] gpios @ref gpio_pin_id. Any combination of pins may be specified
* by OR'ing then together * by OR'ing then together
*/ */
@ -327,7 +329,7 @@ void gpio_set_af(u32 gpioport, u8 alt_func_num, u8 gpios)
GPIO_AFSEL(gpioport) &= ~gpios; GPIO_AFSEL(gpioport) &= ~gpios;
return; return;
} }
/* Enable the alternate function */ /* Enable the alternate function */
GPIO_AFSEL(gpioport) |= gpios; GPIO_AFSEL(gpioport) |= gpios;
/* Alternate functions are digital */ /* Alternate functions are digital */
@ -338,11 +340,12 @@ void gpio_set_af(u32 gpioport, u8 alt_func_num, u8 gpios)
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
pin_mask = (1 << i); pin_mask = (1 << i);
if (!(gpios & pin_mask)) if (!(gpios & pin_mask)) {
continue; continue;
}
pctl32 &= ~PCTL_MASK(i); pctl32 &= ~PCTL_MASK(i);
pctl32 |= PCTL_AF( i, (alt_func_num & 0xf) ); pctl32 |= PCTL_AF(i, (alt_func_num & 0xf));
} }
GPIO_PCTL(gpioport) = pctl32; GPIO_PCTL(gpioport) = pctl32;

20
lib/lm4f/rcc.c
View File

@ -23,7 +23,8 @@
* *
* @ingroup LM4Fxx * @ingroup LM4Fxx
* *
@author @htmlonly &copy; @endhtmlonly 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com> @author @htmlonly &copy; @endhtmlonly 2012
Alexandru Gagniuc <mr.nuke.me@gmail.com>
* \brief <b>libopencm3 LM4F Clock control API</b> * \brief <b>libopencm3 LM4F Clock control API</b>
* *
@ -93,13 +94,13 @@
* High-level routines update the system clock automatically. * High-level routines update the system clock automatically.
* For read access, it is recommended to acces this variable via * For read access, it is recommended to acces this variable via
* @code * @code
* rcc_get_system_clock_frequency(); * rcc_get_system_clock_frequency();
* @endcode * @endcode
* *
* If write access is desired (i.e. when changing the system clock via the * If write access is desired (i.e. when changing the system clock via the
* fine-grained mechanisms), then include the following line in your code: * fine-grained mechanisms), then include the following line in your code:
* @code * @code
* extern u32 lm4f_rcc_sysclk_freq; * extern u32 lm4f_rcc_sysclk_freq;
* @endcode * @endcode
*/ */
u32 lm4f_rcc_sysclk_freq = 16000000; u32 lm4f_rcc_sysclk_freq = 16000000;
@ -266,8 +267,8 @@ void rcc_pll_bypass_enable(void)
* function. * function.
* *
* @param[in] div clock divisor to apply to the 400MHz PLL clock. It is the * @param[in] div clock divisor to apply to the 400MHz PLL clock. It is the
* caller's responsibility to ensure that the divisor will not create * caller's responsibility to ensure that the divisor will not create
* a system clock that is out of spec. * a system clock that is out of spec.
*/ */
void rcc_set_pll_divisor(u8 div400) void rcc_set_pll_divisor(u8 div400)
{ {
@ -334,7 +335,7 @@ void rcc_usb_pll_on(void)
*/ */
void rcc_wait_for_pll_ready(void) void rcc_wait_for_pll_ready(void)
{ {
while(!(SYSCTL_PLLSTAT & SYSCTL_PLLSTAT_LOCK)); while (!(SYSCTL_PLLSTAT & SYSCTL_PLLSTAT_LOCK));
} }
/** /**
@ -434,8 +435,8 @@ static u32 xtal_to_freq(xtal_t xtal)
* @param [in] osc_src Oscillator from where to derive the system clock. * @param [in] osc_src Oscillator from where to derive the system clock.
* @param [in] xtal Type of crystal connected to the OSCO/OSCI pins * @param [in] xtal Type of crystal connected to the OSCO/OSCI pins
* @param [in] pll_div400 The clock divisor to apply to the 400MHz PLL clock. * @param [in] pll_div400 The clock divisor to apply to the 400MHz PLL clock.
* If 0, then the PLL is disabled, and the system runs * If 0, then the PLL is disabled, and the system runs
* off a "raw" clock. * off a "raw" clock.
* *
* @return System clock frequency in Hz * @return System clock frequency in Hz
*/ */
@ -448,8 +449,9 @@ void rcc_sysclk_config(osc_src_t osc_src, xtal_t xtal, u8 pll_div400)
rcc_pll_bypass_enable(); rcc_pll_bypass_enable();
/* Enable the main oscillator, if needed */ /* Enable the main oscillator, if needed */
if (osc_src == OSCSRC_MOSC) if (osc_src == OSCSRC_MOSC) {
rcc_enable_main_osc(); rcc_enable_main_osc();
}
/* Make RCC2 override RCC */ /* Make RCC2 override RCC */
rcc_enable_rcc2(); rcc_enable_rcc2();

32
lib/lm4f/uart.c
View File

@ -116,10 +116,11 @@ void uart_set_baudrate(u32 uart, u32 baud)
u32 clock; u32 clock;
/* Are we running off the internal clock or system clock? */ /* Are we running off the internal clock or system clock? */
if (UART_CC(uart) == UART_CC_CS_PIOSC) if (UART_CC(uart) == UART_CC_CS_PIOSC) {
clock = 16000000; clock = 16000000;
else } else {
clock = rcc_get_system_clock_frequency(); clock = rcc_get_system_clock_frequency();
}
/* Find the baudrate divisor */ /* Find the baudrate divisor */
u32 div = (((clock * 8) / baud) + 1) / 2; u32 div = (((clock * 8) / baud) + 1) / 2;
@ -143,7 +144,7 @@ void uart_set_databits(u32 uart, u8 databits)
bits32 = (databits - 5) << 5; bits32 = (databits - 5) << 5;
/* TODO: What about 9 data bits? */ /* TODO: What about 9 data bits? */
reg32 = UART_LCRH(uart); reg32 = UART_LCRH(uart);
reg32 &= ~UART_LCRH_WLEN_MASK; reg32 &= ~UART_LCRH_WLEN_MASK;
reg32 |= bits32; reg32 |= bits32;
@ -158,10 +159,11 @@ void uart_set_databits(u32 uart, u8 databits)
*/ */
void uart_set_stopbits(u32 uart, u8 stopbits) void uart_set_stopbits(u32 uart, u8 stopbits)
{ {
if (stopbits == 2) if (stopbits == 2) {
UART_LCRH(uart) |= UART_LCRH_STP2; UART_LCRH(uart) |= UART_LCRH_STP2;
else } else {
UART_LCRH(uart) &= ~UART_LCRH_STP2; UART_LCRH(uart) &= ~UART_LCRH_STP2;
}
} }
/** /**
@ -178,8 +180,7 @@ void uart_set_parity(u32 uart, enum uart_parity parity)
reg32 |= UART_LCRH_PEN; reg32 |= UART_LCRH_PEN;
reg32 &= ~(UART_LCRH_SPS | UART_LCRH_EPS); reg32 &= ~(UART_LCRH_SPS | UART_LCRH_EPS);
switch (parity) switch (parity) {
{
case UART_PARITY_NONE: case UART_PARITY_NONE:
/* Once we disable parity the other bits are meaningless */ /* Once we disable parity the other bits are meaningless */
UART_LCRH(uart) &= ~UART_LCRH_PEN; UART_LCRH(uart) &= ~UART_LCRH_PEN;
@ -218,12 +219,13 @@ void uart_set_flow_control(u32 uart, enum uart_flowctl flow)
reg32 &= ~(UART_CTL_RTSEN | UART_CTL_CTSEN); reg32 &= ~(UART_CTL_RTSEN | UART_CTL_CTSEN);
if (flow == UART_FLOWCTL_RTS) if (flow == UART_FLOWCTL_RTS) {
reg32 |= UART_CTL_RTSEN; reg32 |= UART_CTL_RTSEN;
else if (flow == UART_FLOWCTL_CTS) } else if (flow == UART_FLOWCTL_CTS) {
reg32 |= UART_CTL_CTSEN; reg32 |= UART_CTL_CTSEN;
else if (flow == UART_FLOWCTL_RTS_CTS) } else if (flow == UART_FLOWCTL_RTS_CTS) {
reg32 |= (UART_CTL_RTSEN | UART_CTL_CTSEN); reg32 |= (UART_CTL_RTSEN | UART_CTL_CTSEN);
}
UART_CTL(uart) = reg32; UART_CTL(uart) = reg32;
} }
@ -301,7 +303,7 @@ u16 uart_recv(u32 uart)
void uart_wait_send_ready(u32 uart) void uart_wait_send_ready(u32 uart)
{ {
/* Wait until the Tx FIFO is no longer full */ /* Wait until the Tx FIFO is no longer full */
while(UART_FR(uart) & UART_FR_TXFF); while (UART_FR(uart) & UART_FR_TXFF);
} }
/** /**
@ -314,7 +316,7 @@ void uart_wait_send_ready(u32 uart)
void uart_wait_recv_ready(u32 uart) void uart_wait_recv_ready(u32 uart)
{ {
/* Wait until the Tx FIFO is no longer empty */ /* Wait until the Tx FIFO is no longer empty */
while(UART_FR(uart) & UART_FR_RXFE); while (UART_FR(uart) & UART_FR_RXFE);
} }
/** /**
@ -438,8 +440,8 @@ void uart_enable_interrupts(u32 uart, enum uart_interrupt_flag ints)
* interrupts, pass (UART_INT_RX | UART_INT_CTS) * interrupts, pass (UART_INT_RX | UART_INT_CTS)
* *
* @param[in] uart UART block register address base @ref uart_reg_base * @param[in] uart UART block register address base @ref uart_reg_base
* @param[in] ints Interrupts which to disable. Any combination of interrupts may * @param[in] ints Interrupts which to disable. Any combination of interrupts
* be specified by OR'ing then together * may be specified by OR'ing then together
*/ */
void uart_disable_interrupts(u32 uart, enum uart_interrupt_flag ints) void uart_disable_interrupts(u32 uart, enum uart_interrupt_flag ints)
{ {

121
lib/lm4f/usb_lm4f.c
View File

@ -232,8 +232,9 @@ static void lm4f_ep_setup(usbd_device *usbd_dev, u8 addr, u8 type, u16 max_size,
if (addr == 0) { if (addr == 0) {
USB_EPIDX = 0; USB_EPIDX = 0;
if (reg8 > USB_FIFOSZ_SIZE_64) if (reg8 > USB_FIFOSZ_SIZE_64) {
reg8 = USB_FIFOSZ_SIZE_64; reg8 = USB_FIFOSZ_SIZE_64;
}
/* The RX and TX FIFOs are shared for EP0 */ /* The RX and TX FIFOs are shared for EP0 */
USB_RXFIFOSZ = reg8; USB_RXFIFOSZ = reg8;
@ -248,8 +249,9 @@ static void lm4f_ep_setup(usbd_device *usbd_dev, u8 addr, u8 type, u16 max_size,
} }
/* Are we out of FIFO space? */ /* Are we out of FIFO space? */
if (usbd_dev->fifo_mem_top + fifo_size > MAX_FIFO_RAM) if (usbd_dev->fifo_mem_top + fifo_size > MAX_FIFO_RAM) {
return; return;
}
USB_EPIDX = addr & USB_EPIDX_MASK; USB_EPIDX = addr & USB_EPIDX_MASK;
@ -262,12 +264,12 @@ static void lm4f_ep_setup(usbd_device *usbd_dev, u8 addr, u8 type, u16 max_size,
usbd_dev->user_callback_ctr[ep][USB_TRANSACTION_IN] = usbd_dev->user_callback_ctr[ep][USB_TRANSACTION_IN] =
(void *)callback; (void *)callback;
} }
if (type == USB_ENDPOINT_ATTR_ISOCHRONOUS) if (type == USB_ENDPOINT_ATTR_ISOCHRONOUS) {
USB_TXCSRH(ep) |= USB_TXCSRH_ISO; USB_TXCSRH(ep) |= USB_TXCSRH_ISO;
else } else {
USB_TXCSRH(ep) &= ~USB_TXCSRH_ISO; USB_TXCSRH(ep) &= ~USB_TXCSRH_ISO;
} }
else { } else {
USB_RXMAXP(ep) = max_size; USB_RXMAXP(ep) = max_size;
USB_RXFIFOSZ = reg8; USB_RXFIFOSZ = reg8;
USB_RXFIFOADD = ((usbd_dev->fifo_mem_top) >> 3); USB_RXFIFOADD = ((usbd_dev->fifo_mem_top) >> 3);
@ -275,10 +277,11 @@ static void lm4f_ep_setup(usbd_device *usbd_dev, u8 addr, u8 type, u16 max_size,
usbd_dev->user_callback_ctr[ep][USB_TRANSACTION_OUT] = usbd_dev->user_callback_ctr[ep][USB_TRANSACTION_OUT] =
(void *)callback; (void *)callback;
} }
if (type == USB_ENDPOINT_ATTR_ISOCHRONOUS) if (type == USB_ENDPOINT_ATTR_ISOCHRONOUS) {
USB_RXCSRH(ep) |= USB_RXCSRH_ISO; USB_RXCSRH(ep) |= USB_RXCSRH_ISO;
else } else {
USB_RXCSRH(ep) &= ~USB_RXCSRH_ISO; USB_RXCSRH(ep) &= ~USB_RXCSRH_ISO;
}
} }
usbd_dev->fifo_mem_top += fifo_size; usbd_dev->fifo_mem_top += fifo_size;
@ -301,24 +304,27 @@ static void lm4f_ep_stall_set(usbd_device *usbd_dev, u8 addr, u8 stall)
const bool dir_tx = addr & 0x80; const bool dir_tx = addr & 0x80;
if (ep == 0) { if (ep == 0) {
if (stall) if (stall) {
USB_CSRL0 |= USB_CSRL0_STALL; USB_CSRL0 |= USB_CSRL0_STALL;
else } else {
USB_CSRL0 &= ~USB_CSRL0_STALL; USB_CSRL0 &= ~USB_CSRL0_STALL;
}
return; return;
} }
if (dir_tx) { if (dir_tx) {
if (stall) if (stall) {
(USB_TXCSRL(ep)) |= USB_TXCSRL_STALL; (USB_TXCSRL(ep)) |= USB_TXCSRL_STALL;
else } else {
(USB_TXCSRL(ep)) &= ~USB_TXCSRL_STALL; (USB_TXCSRL(ep)) &= ~USB_TXCSRL_STALL;
}
} }
else { else {
if (stall) if (stall) {
(USB_RXCSRL(ep)) |= USB_RXCSRL_STALL; (USB_RXCSRL(ep)) |= USB_RXCSRL_STALL;
else } else {
(USB_RXCSRL(ep)) &= ~USB_RXCSRL_STALL; (USB_RXCSRL(ep)) &= ~USB_RXCSRL_STALL;
}
} }
} }
@ -330,13 +336,14 @@ static u8 lm4f_ep_stall_get(usbd_device *usbd_dev, u8 addr)
const bool dir_tx = addr & 0x80; const bool dir_tx = addr & 0x80;
if (ep == 0) { if (ep == 0) {
return (USB_CSRL0 & USB_CSRL0_STALLED); return USB_CSRL0 & USB_CSRL0_STALLED;
} }
if (dir_tx) if (dir_tx) {
return (USB_TXCSRL(ep) & USB_TXCSRL_STALLED); return USB_TXCSRL(ep) & USB_TXCSRL_STALLED;
else } else {
return (USB_RXCSRL(ep) & USB_RXCSRL_STALLED); return USB_RXCSRL(ep) & USB_RXCSRL_STALLED;
}
} }
static void lm4f_ep_nak_set(usbd_device *usbd_dev, u8 addr, u8 nak) static void lm4f_ep_nak_set(usbd_device *usbd_dev, u8 addr, u8 nak)
@ -368,14 +375,16 @@ static u16 lm4f_ep_write_packet(usbd_device *usbd_dev, u8 addr,
* the reads are downgraded to 8-bit in hardware. We lose a bit of * the reads are downgraded to 8-bit in hardware. We lose a bit of
* performance, but we don't crash. * performance, but we don't crash.
*/ */
for (i = 0; i < (len & ~0x3); i += 4) for (i = 0; i < (len & ~0x3); i += 4) {
USB_FIFO32(ep) = *((u32 *)(buf + i)); USB_FIFO32(ep) = *((u32 *)(buf + i));
}
if (len & 0x2) { if (len & 0x2) {
USB_FIFO16(ep) = *((u16 *)(buf + i)); USB_FIFO16(ep) = *((u16 *)(buf + i));
i += 2; i += 2;
} }
if (len & 0x1) if (len & 0x1) {
USB_FIFO8(ep) = *((u8 *)(buf + i)); USB_FIFO8(ep) = *((u8 *)(buf + i));
}
if (ep == 0) { if (ep == 0) {
/* /*
@ -384,11 +393,11 @@ static u16 lm4f_ep_write_packet(usbd_device *usbd_dev, u8 addr,
* that is a multiple of 64 bytes will end with a zero-length * that is a multiple of 64 bytes will end with a zero-length
* packet, so our check is sane. * packet, so our check is sane.
*/ */
if (len != 64) if (len != 64) {
USB_CSRL0 |= USB_CSRL0_TXRDY | USB_CSRL0_DATAEND; USB_CSRL0 |= USB_CSRL0_TXRDY | USB_CSRL0_DATAEND;
else } else {
USB_CSRL0 |= USB_CSRL0_TXRDY; USB_CSRL0 |= USB_CSRL0_TXRDY;
}
} else { } else {
USB_TXCSRL(ep) |= USB_TXCSRL_TXRDY; USB_TXCSRL(ep) |= USB_TXCSRL_TXRDY;
} }
@ -396,7 +405,8 @@ static u16 lm4f_ep_write_packet(usbd_device *usbd_dev, u8 addr,
return i; return i;
} }
static u16 lm4f_ep_read_packet(usbd_device *usbd_dev, u8 addr, void *buf, u16 len) static u16 lm4f_ep_read_packet(usbd_device *usbd_dev, u8 addr, void *buf,
u16 len)
{ {
(void)usbd_dev; (void)usbd_dev;
@ -412,14 +422,16 @@ static u16 lm4f_ep_read_packet(usbd_device *usbd_dev, u8 addr, void *buf, u16 le
* the writes are downgraded to 8-bit in hardware. We lose a bit of * the writes are downgraded to 8-bit in hardware. We lose a bit of
* performance, but we don't crash. * performance, but we don't crash.
*/ */
for (len = 0; len < (rlen & ~0x3); len += 4) for (len = 0; len < (rlen & ~0x3); len += 4) {
*((u32 *)(buf + len)) = USB_FIFO32(ep); *((u32 *)(buf + len)) = USB_FIFO32(ep);
}
if (rlen & 0x2) { if (rlen & 0x2) {
*((u16 *)(buf + len)) = USB_FIFO16(ep); *((u16 *)(buf + len)) = USB_FIFO16(ep);
len += 2; len += 2;
} }
if (rlen & 0x1) if (rlen & 0x1) {
*((u8 *)(buf + len)) = USB_FIFO8(ep); *((u8 *)(buf + len)) = USB_FIFO8(ep);
}
if (ep == 0) { if (ep == 0) {
/* /*
@ -456,17 +468,21 @@ static void lm4f_poll(usbd_device *usbd_dev)
const u8 usb_txis = USB_TXIS; const u8 usb_txis = USB_TXIS;
const u8 usb_csrl0 = USB_CSRL0; const u8 usb_csrl0 = USB_CSRL0;
if ((usb_is & USB_IM_SUSPEND) && (usbd_dev->user_callback_suspend)) if ((usb_is & USB_IM_SUSPEND) && (usbd_dev->user_callback_suspend)) {
usbd_dev->user_callback_suspend(); usbd_dev->user_callback_suspend();
}
if ((usb_is & USB_IM_RESUME) && (usbd_dev->user_callback_resume))
usbd_dev->user_callback_resume();
if (usb_is & USB_IM_RESET) if ((usb_is & USB_IM_RESUME) && (usbd_dev->user_callback_resume)) {
usbd_dev->user_callback_resume();
}
if (usb_is & USB_IM_RESET) {
_usbd_reset(usbd_dev); _usbd_reset(usbd_dev);
}
if ((usb_is & USB_IM_SOF) && (usbd_dev->user_callback_sof))
if ((usb_is & USB_IM_SOF) && (usbd_dev->user_callback_sof)) {
usbd_dev->user_callback_sof(); usbd_dev->user_callback_sof();
}
if (usb_txis & USB_EP0) { if (usb_txis & USB_EP0) {
/* /*
@ -483,14 +499,17 @@ static void lm4f_poll(usbd_device *usbd_dev)
type = (usbd_dev->control_state.state != DATA_OUT && type = (usbd_dev->control_state.state != DATA_OUT &&
usbd_dev->control_state.state != LAST_DATA_OUT) usbd_dev->control_state.state != LAST_DATA_OUT)
? USB_TRANSACTION_SETUP : ? USB_TRANSACTION_SETUP :
USB_TRANSACTION_OUT ; USB_TRANSACTION_OUT;
if (usbd_dev->user_callback_ctr[0][type]) if (usbd_dev->user_callback_ctr[0][type]) {
usbd_dev->user_callback_ctr[0][type] (usbd_dev, 0); usbd_dev->
user_callback_ctr[0][type](usbd_dev, 0);
}
} else { } else {
tx_cb = usbd_dev->user_callback_ctr[0][USB_TRANSACTION_IN]; tx_cb = usbd_dev->user_callback_ctr[0]
[USB_TRANSACTION_IN];
/* /*
* EP0 bit in TXIS is set not only when a packet is * EP0 bit in TXIS is set not only when a packet is
@ -508,11 +527,13 @@ static void lm4f_poll(usbd_device *usbd_dev)
*/ */
if ((usbd_dev->control_state.state != DATA_IN) && if ((usbd_dev->control_state.state != DATA_IN) &&
(usbd_dev->control_state.state != LAST_DATA_IN) && (usbd_dev->control_state.state != LAST_DATA_IN) &&
(usbd_dev->control_state.state != STATUS_IN)) (usbd_dev->control_state.state != STATUS_IN)) {
return; return;
}
if (tx_cb) if (tx_cb) {
tx_cb (usbd_dev, 0); tx_cb(usbd_dev, 0);
}
} }
} }
@ -521,11 +542,13 @@ static void lm4f_poll(usbd_device *usbd_dev)
tx_cb = usbd_dev->user_callback_ctr[i][USB_TRANSACTION_IN]; tx_cb = usbd_dev->user_callback_ctr[i][USB_TRANSACTION_IN];
rx_cb = usbd_dev->user_callback_ctr[i][USB_TRANSACTION_OUT]; rx_cb = usbd_dev->user_callback_ctr[i][USB_TRANSACTION_OUT];
if ( (usb_txis & (1 << i)) && tx_cb) if ((usb_txis & (1 << i)) && tx_cb) {
tx_cb(usbd_dev, i); tx_cb(usbd_dev, i);
}
if ( (usb_rxis & (1 << i)) && rx_cb) if ((usb_rxis & (1 << i)) && rx_cb) {
rx_cb(usbd_dev, i); rx_cb(usbd_dev, i);
}
} }
@ -540,10 +563,11 @@ static void lm4f_disconnect(usbd_device *usbd_dev, bool disconnected)
* usbd_disconnect(dev, 1) followed by usbd_disconnect(dev, 0) * usbd_disconnect(dev, 1) followed by usbd_disconnect(dev, 0)
* causes the device to re-enumerate and re-configure properly. * causes the device to re-enumerate and re-configure properly.
*/ */
if (disconnected) if (disconnected) {
lm4f_usb_soft_disconnect(); lm4f_usb_soft_disconnect();
else } else {
lm4f_usb_soft_connect(); lm4f_usb_soft_connect();
}
} }
/* /*
@ -568,8 +592,9 @@ static usbd_device *lm4f_usbd_init(void)
/* Software reset USB */ /* Software reset USB */
SYSCTL_SRUSB = 1; SYSCTL_SRUSB = 1;
for (i = 0; i < 1000; i++) for (i = 0; i < 1000; i++) {
__asm__("nop"); __asm__("nop");
}
SYSCTL_SRUSB = 0; SYSCTL_SRUSB = 0;
/* /*
@ -579,8 +604,8 @@ static usbd_device *lm4f_usbd_init(void)
*/ */
/* Wait for it */ /* Wait for it */
i = 0; i = 0;
while ( (SYSCTL_RIS & SYSCTL_RIS_USBPLLLRIS) == 0) { while ((SYSCTL_RIS & SYSCTL_RIS_USBPLLLRIS) == 0) {
i ++; i++;
if (i > 0xffff) { if (i > 0xffff) {
return 0; return 0;
} }

2
lib/lpc17xx/gpio.c
View File

@ -41,7 +41,7 @@ void gpio_set(u32 gpioport, u32 gpios)
void gpio_clear(u32 gpioport, u32 gpios) void gpio_clear(u32 gpioport, u32 gpios)
{ {
GPIO_CLR(gpioport) = gpios; GPIO_CLR(gpioport) = gpios;
} }
/**@}*/ /**@}*/

9
lib/lpc43xx/i2c.c
View File

@ -81,8 +81,9 @@ void i2c0_tx_start(void)
/* transmit data byte */ /* transmit data byte */
void i2c0_tx_byte(u8 byte) void i2c0_tx_byte(u8 byte)
{ {
if (I2C0_CONSET & I2C_CONSET_STA) if (I2C0_CONSET & I2C_CONSET_STA) {
I2C0_CONCLR = I2C_CONCLR_STAC; I2C0_CONCLR = I2C_CONCLR_STAC;
}
I2C0_DAT = byte; I2C0_DAT = byte;
I2C0_CONCLR = I2C_CONCLR_SIC; I2C0_CONCLR = I2C_CONCLR_SIC;
while (!(I2C0_CONSET & I2C_CONSET_SI)); while (!(I2C0_CONSET & I2C_CONSET_SI));
@ -91,8 +92,9 @@ void i2c0_tx_byte(u8 byte)
/* receive data byte */ /* receive data byte */
u8 i2c0_rx_byte(void) u8 i2c0_rx_byte(void)
{ {
if (I2C0_CONSET & I2C_CONSET_STA) if (I2C0_CONSET & I2C_CONSET_STA) {
I2C0_CONCLR = I2C_CONCLR_STAC; I2C0_CONCLR = I2C_CONCLR_STAC;
}
I2C0_CONCLR = I2C_CONCLR_SIC; I2C0_CONCLR = I2C_CONCLR_SIC;
while (!(I2C0_CONSET & I2C_CONSET_SI)); while (!(I2C0_CONSET & I2C_CONSET_SI));
return I2C0_DAT; return I2C0_DAT;
@ -101,8 +103,9 @@ u8 i2c0_rx_byte(void)
/* transmit stop bit */ /* transmit stop bit */
void i2c0_stop(void) void i2c0_stop(void)
{ {
if (I2C0_CONSET & I2C_CONSET_STA) if (I2C0_CONSET & I2C_CONSET_STA) {
I2C0_CONCLR = I2C_CONCLR_STAC; I2C0_CONCLR = I2C_CONCLR_STAC;
}
I2C0_CONSET = I2C_CONSET_STO; I2C0_CONSET = I2C_CONSET_STO;
I2C0_CONCLR = I2C_CONCLR_SIC; I2C0_CONCLR = I2C_CONCLR_SIC;
} }

8
lib/lpc43xx/scu.c
View File

@ -34,13 +34,17 @@ LGPL License Terms @ref lgpl_license
#include <libopencm3/lpc43xx/scu.h> #include <libopencm3/lpc43xx/scu.h>
/* For pin_conf_normal value see scu.h define SCU_CONF_XXX or Configuration for different I/O pins types */ /* For pin_conf_normal value see scu.h define SCU_CONF_XXX or Configuration for
* different I/O pins types
*/
void scu_pinmux(scu_grp_pin_t group_pin, u32 scu_conf) void scu_pinmux(scu_grp_pin_t group_pin, u32 scu_conf)
{ {
MMIO32(group_pin) = scu_conf; MMIO32(group_pin) = scu_conf;
} }
/* For other special SCU register USB1, I2C0, ADC0/1, DAC, EMC clock delay See scu.h */ /* For other special SCU register USB1, I2C0, ADC0/1, DAC, EMC clock delay See
* scu.h
*/
/* For Pin interrupt select register see scu.h SCU_PINTSEL0 & SCU_PINTSEL1 */ /* For Pin interrupt select register see scu.h SCU_PINTSEL0 & SCU_PINTSEL1 */

47
lib/lpc43xx/ssp.c
View File

@ -61,11 +61,9 @@ void ssp_disable(ssp_num_t ssp_num)
{ {
u32 ssp_port; u32 ssp_port;
if(ssp_num == SSP0_NUM) if (ssp_num == SSP0_NUM) {
{
ssp_port = SSP0; ssp_port = SSP0;
}else } else {
{
ssp_port = SSP1; ssp_port = SSP1;
} }
/* Disable SSP */ /* Disable SSP */
@ -88,16 +86,15 @@ void ssp_init(ssp_num_t ssp_num,
u32 ssp_port; u32 ssp_port;
u32 clock; u32 clock;
if(ssp_num == SSP0_NUM) if (ssp_num == SSP0_NUM) {
{
ssp_port = SSP0; ssp_port = SSP0;
}else } else {
{
ssp_port = SSP1; ssp_port = SSP1;
} }
/* use PLL1 as clock source for SSP1 */ /* use PLL1 as clock source for SSP1 */
CGU_BASE_SSP1_CLK = (CGU_SRC_PLL1<<CGU_BASE_CLK_SEL_SHIFT) | (1<<CGU_AUTOBLOCK_CLOCK_BIT); CGU_BASE_SSP1_CLK = (CGU_SRC_PLL1<<CGU_BASE_CLK_SEL_SHIFT) |
(1<<CGU_AUTOBLOCK_CLOCK_BIT);
/* Disable SSP before to configure it */ /* Disable SSP before to configure it */
SSP_CR1(ssp_port) = 0x0; SSP_CR1(ssp_port) = 0x0;
@ -105,7 +102,8 @@ void ssp_init(ssp_num_t ssp_num,
/* Configure SSP */ /* Configure SSP */
clock = serial_clock_rate; clock = serial_clock_rate;
SSP_CPSR(ssp_port) = clk_prescale; SSP_CPSR(ssp_port) = clk_prescale;
SSP_CR0(ssp_port) = (data_size | frame_format | cpol_cpha_format | (clock<<8) ); SSP_CR0(ssp_port) =
(data_size | frame_format | cpol_cpha_format | (clock<<8));
/* Enable SSP */ /* Enable SSP */
SSP_CR1(ssp_port) = (SSP_ENABLE | mode | master_slave | slave_option); SSP_CR1(ssp_port) = (SSP_ENABLE | mode | master_slave | slave_option);
@ -118,15 +116,14 @@ u16 ssp_read(ssp_num_t ssp_num)
{ {
u32 ssp_port; u32 ssp_port;
if(ssp_num == SSP0_NUM) if (ssp_num == SSP0_NUM) {
{
ssp_port = SSP0; ssp_port = SSP0;
}else } else {
{
ssp_port = SSP1; ssp_port = SSP1;
} }
/* Wait Until Data Received (Rx FIFO not Empty) */ /* Wait Until Data Received (Rx FIFO not Empty) */
while( (SSP_SR(ssp_port) & SSP_SR_RNE) == 0); while ((SSP_SR(ssp_port) & SSP_SR_RNE) == 0);
return SSP_DR(ssp_port); return SSP_DR(ssp_port);
} }
@ -134,16 +131,14 @@ u16 ssp_read(ssp_num_t ssp_num)
void ssp_wait_until_not_busy(ssp_num_t ssp_num) void ssp_wait_until_not_busy(ssp_num_t ssp_num)
{ {
u32 ssp_port; u32 ssp_port;
if(ssp_num == SSP0_NUM) if (ssp_num == SSP0_NUM) {
{
ssp_port = SSP0; ssp_port = SSP0;
}else } else {
{
ssp_port = SSP1; ssp_port = SSP1;
} }
while( (SSP_SR(ssp_port) & SSP_SR_BSY) ); while ((SSP_SR(ssp_port) & SSP_SR_BSY));
} }
/* This Function Wait Data TX Ready, and Write Data to SSP */ /* This Function Wait Data TX Ready, and Write Data to SSP */
@ -151,19 +146,17 @@ void ssp_write(ssp_num_t ssp_num, u16 data)
{ {
u32 ssp_port; u32 ssp_port;
if(ssp_num == SSP0_NUM) if (ssp_num == SSP0_NUM) {
{
ssp_port = SSP0; ssp_port = SSP0;
}else } else {
{
ssp_port = SSP1; ssp_port = SSP1;
} }
/* Wait Until FIFO not full */ /* Wait Until FIFO not full */
while( (SSP_SR(ssp_port) & SSP_SR_TNF) == 0); while ((SSP_SR(ssp_port) & SSP_SR_TNF) == 0);
SSP_DR(ssp_port) = data; SSP_DR(ssp_port) = data;
/* Wait for not busy, since we're controlling CS# of /* Wait for not busy, since we're controlling CS# of
* devices manually and need to wait for the data to * devices manually and need to wait for the data to
* be sent. It may also be important to wait here * be sent. It may also be important to wait here

Some files were not shown because too many files have changed in this diff Show More