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

Merge pull request #242 from ksarkies/typos

Browse Source 
Merged bugfix. Thanks.
This commit is contained in:
Frantisek Burian 2014-01-14 00:39:02 -08:00
commit e4f4845e0c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,12 +507,12 @@
#define GPDMA_CxCONFIG_SRCPERIPHERAL_SHIFT (1) #define GPDMA_CxCONFIG_SRCPERIPHERAL_SHIFT (1)
#define GPDMA_CxCONFIG_SRCPERIPHERAL_MASK \ #define GPDMA_CxCONFIG_SRCPERIPHERAL_MASK \
(0x1f << GPDMA_CxCONFIG_SRCPERIPHERAL_SHIFT) (0x1f << GPDMA_CxCONFIG_SRCPERIPHERAL_SHIFT)
#define GPDMA_CxCONFIG_SRCPERIPHERAL(x) #define GPDMA_CxCONFIG_SRCPERIPHERAL(x) \
((x) << GPDMA_CxCONFIG_SRCPERIPHERAL_SHIFT) ((x) << GPDMA_CxCONFIG_SRCPERIPHERAL_SHIFT)
/* DESTPERIPHERAL: Destination peripheral */ /* DESTPERIPHERAL: Destination peripheral */
#define GPDMA_CxCONFIG_DESTPERIPHERAL_SHIFT (6) #define GPDMA_CxCONFIG_DESTPERIPHERAL_SHIFT (6)
#define GPDMA_CxCONFIG_DESTPERIPHERAL_MASK #define GPDMA_CxCONFIG_DESTPERIPHERAL_MASK \
(0x1f << GPDMA_CxCONFIG_DESTPERIPHERAL_SHIFT) (0x1f << GPDMA_CxCONFIG_DESTPERIPHERAL_SHIFT)
#define GPDMA_CxCONFIG_DESTPERIPHERAL(x) \ #define GPDMA_CxCONFIG_DESTPERIPHERAL(x) \
((x) << GPDMA_CxCONFIG_DESTPERIPHERAL_SHIFT) ((x) << GPDMA_CxCONFIG_DESTPERIPHERAL_SHIFT)

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

@ -483,7 +483,7 @@ LGPL License Terms @ref lgpl_license
#define SGPIO_MUX_CFGx_CLK_SOURCE_SLICE_MODE_SHIFT (3) #define SGPIO_MUX_CFGx_CLK_SOURCE_SLICE_MODE_SHIFT (3)
#define SGPIO_MUX_CFGx_CLK_SOURCE_SLICE_MODE_MASK \ #define SGPIO_MUX_CFGx_CLK_SOURCE_SLICE_MODE_MASK \
(0x3 << SGPIO_MUX_CFGx_CLK_SOURCE_SLICE_MODE_SHIFT) (0x3 << SGPIO_MUX_CFGx_CLK_SOURCE_SLICE_MODE_SHIFT)
#define SGPIO_MUX_CFGx_CLK_SOURCE_SLICE_MODE(x) #define SGPIO_MUX_CFGx_CLK_SOURCE_SLICE_MODE(x) \
((x) << SGPIO_MUX_CFGx_CLK_SOURCE_SLICE_MODE_SHIFT) ((x) << SGPIO_MUX_CFGx_CLK_SOURCE_SLICE_MODE_SHIFT)
/* QUALIFIER_MODE: Select qualifier mode */ /* QUALIFIER_MODE: Select qualifier mode */