diff --git a/README.md b/README.md index 92d89f67..938d5e29 100644 --- a/README.md +++ b/README.md @@ -66,11 +66,11 @@ The most heavily tested toolchain is "gcc-arm-embedded" https://launchpad.net/gcc-arm-embedded Other toolchains _should_ work, but have not been nearly as well tested. -Toolchains targetting linux, such as "gcc-arm-linux-gnu" or the like are +Toolchains targeting linux, such as "gcc-arm-linux-gnu" or the like are _not_ appropriate. _NOTE_ We recommend, that you use g-a-c version 2.8 2014q3 or newer -to build all platforms covered by libopencm3 succesfully. +to build all platforms covered by libopencm3 successfully. Building -------- diff --git a/include/libopencm3/cm3/mpu.h b/include/libopencm3/cm3/mpu.h index 2db38038..3d6960af 100644 --- a/include/libopencm3/cm3/mpu.h +++ b/include/libopencm3/cm3/mpu.h @@ -57,7 +57,7 @@ /** @defgroup CM3_mpu_type MPU TYPE register fields * @ingroup CM3_mpu_defines - * The MPU_TYPE register is always avilable, even if the MPU is not implemented. + * The MPU_TYPE register is always available, even if the MPU is not implemented. * In that case, the DREGION field will read as 0. *@{*/ /** v6m/v7m only support a unified MPU (IREGION always 0) */ diff --git a/include/libopencm3/cm3/scb.h b/include/libopencm3/cm3/scb.h index 7050ffae..da2de8d9 100644 --- a/include/libopencm3/cm3/scb.h +++ b/include/libopencm3/cm3/scb.h @@ -215,7 +215,7 @@ #define SCB_AIRCR_VECTKEYSTAT (0xFFFF << SCB_AIRCR_VECTKEYSTAT_LSB) #define SCB_AIRCR_VECTKEY (0x05FA << SCB_AIRCR_VECTKEYSTAT_LSB) -/* ENDIANESS Data endianness bit */ +/* ENDIANNESS Data endianness bit */ #define SCB_AIRCR_ENDIANESS (1 << 15) /* Those defined only on ARMv7 and above */ diff --git a/include/libopencm3/lm4f/uart.h b/include/libopencm3/lm4f/uart.h index d12f30e9..f36556ee 100644 --- a/include/libopencm3/lm4f/uart.h +++ b/include/libopencm3/lm4f/uart.h @@ -319,7 +319,7 @@ #define UART_DMACTL_DMAERR (1 << 2) /** Transmit DMA enable */ #define UART_DMACTL_TXDMAE (1 << 1) -/** Recieve DMA enable */ +/** Receive DMA enable */ #define UART_DMACTL_RXDMAE (1 << 0) /* ============================================================================= diff --git a/include/libopencm3/stm32/common/adc_common_v1.h b/include/libopencm3/stm32/common/adc_common_v1.h index c8773fe6..3a9514ea 100644 --- a/include/libopencm3/stm32/common/adc_common_v1.h +++ b/include/libopencm3/stm32/common/adc_common_v1.h @@ -287,7 +287,7 @@ specific memorymap.h header before including this header file.*/ /* DMA: Direct memory access mode. (ADC1 and ADC3 only!) */ #define ADC_CR2_DMA (1 << 8) -/* CONT: Continous conversion. */ +/* CONT: Continuous conversion. */ #define ADC_CR2_CONT (1 << 1) /* ADON: A/D converter On/Off. */ diff --git a/include/libopencm3/stm32/common/i2c_common_all.h b/include/libopencm3/stm32/common/i2c_common_all.h index 42acea0c..059ef10f 100644 --- a/include/libopencm3/stm32/common/i2c_common_all.h +++ b/include/libopencm3/stm32/common/i2c_common_all.h @@ -163,7 +163,7 @@ specific memorymap.h header before including this header file.*/ /* Note: Bits [7:6] are reserved, and forced to 0 by hardware. */ /* FREQ[5:0]: Peripheral clock frequency (valid values: 2-36 MHz, 2-42 MHz for - * STM32F4 respectivly) */ + * STM32F4 respectively) */ /****************************************************************************/ /** @defgroup i2c_clock I2C clock frequency settings @ingroup i2c_defines diff --git a/include/libopencm3/stm32/f1/adc.h b/include/libopencm3/stm32/f1/adc.h index d39cedc2..39fb3425 100644 --- a/include/libopencm3/stm32/f1/adc.h +++ b/include/libopencm3/stm32/f1/adc.h @@ -273,7 +273,7 @@ and ADC2 /* CAL: A/D Calibration. */ #define ADC_CR2_CAL (1 << 2) -/* CONT: Continous conversion. */ +/* CONT: Continuous conversion. */ #define ADC_CR2_CONT (1 << 1) /* ADON: A/D converter On/Off. */ diff --git a/include/libopencm3/stm32/f3/usart.h b/include/libopencm3/stm32/f3/usart.h index e429ddc8..86961d3a 100644 --- a/include/libopencm3/stm32/f3/usart.h +++ b/include/libopencm3/stm32/f3/usart.h @@ -252,7 +252,7 @@ /* ADDM7:7-bit Address Detection/4-bit Address Detection */ #define USART_CR2_ADDM7 (1 << 4) -/* ADD[3:0]: Addres of the usart node +/* ADD[3:0]: Address of the usart node #define USART_CR2_ADD_MASK 0xF */ /* --- USART_CR3 values ---------------------------------------------------- */ diff --git a/include/libopencm3/stm32/f4/adc.h b/include/libopencm3/stm32/f4/adc.h index 07addb52..4ce71aab 100644 --- a/include/libopencm3/stm32/f4/adc.h +++ b/include/libopencm3/stm32/f4/adc.h @@ -241,7 +241,7 @@ LGPL License Terms @ref lgpl_license /* Note: Bits [7:2] are reserved and must be kept at reset value. */ -/* CONT: Continous conversion. */ +/* CONT: Continuous conversion. */ #define ADC_CR2_CONT (1 << 1) /* ADON: A/D converter On/Off. */ diff --git a/include/libopencm3/usb/usbd.h b/include/libopencm3/usb/usbd.h index a7c125a4..bcd28ea0 100644 --- a/include/libopencm3/usb/usbd.h +++ b/include/libopencm3/usb/usbd.h @@ -157,7 +157,7 @@ extern void usbd_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type, /** Write a packet * @param addr EP address (direction is ignored) * @param len # of bytes - * @return 0 if failed, len if succesful + * @return 0 if failed, len if successful */ extern uint16_t usbd_ep_write_packet(usbd_device *usbd_dev, uint8_t addr, const void *buf, uint16_t len); diff --git a/include/libopencm3/usb/usbstd.h b/include/libopencm3/usb/usbstd.h index abfc8b03..ec5881ae 100644 --- a/include/libopencm3/usb/usbstd.h +++ b/include/libopencm3/usb/usbstd.h @@ -13,7 +13,7 @@ Gareth McMullin @date 10 March 2013 A set of structure definitions for the USB control structures -defined in chapter 9 of the "Univeral Serial Bus Specification Revision 2.0" +defined in chapter 9 of the "Universal Serial Bus Specification Revision 2.0" Available from the USB Implementers Forum - http://www.usb.org/ LGPL License Terms @ref lgpl_license @@ -48,7 +48,7 @@ LGPL License Terms @ref lgpl_license /* * This file contains structure definitions for the USB control structures - * defined in chapter 9 of the "Univeral Serial Bus Specification Revision 2.0" + * defined in chapter 9 of the "Universal Serial Bus Specification Revision 2.0" * Available from the USB Implementers Forum - http://www.usb.org/ */ diff --git a/lib/cm3/dwt.c b/lib/cm3/dwt.c index fe7c2611..b4408b0c 100644 --- a/lib/cm3/dwt.c +++ b/lib/cm3/dwt.c @@ -27,7 +27,7 @@ * benchmarking performance of the code. If function fails, the cycle counter * isn't available on this architecture. * - * @returnd true, if success + * @return true, if success */ bool dwt_enable_cycle_counter(void) { diff --git a/lib/lm4f/gpio.c b/lib/lm4f/gpio.c index 0a103cf5..e89bbebb 100644 --- a/lib/lm4f/gpio.c +++ b/lib/lm4f/gpio.c @@ -502,7 +502,7 @@ void gpio_toggle(uint32_t gpioport, uint8_t gpios) * serviced_irq |= GPIO4; * } * - * // Clear the interupt flag for the processed IRQs + * // Clear the interrupt flag for the processed IRQs * gpio_clear_interrupt_flag(GPIOF, serviced_irqs); * } * @endcode diff --git a/lib/lm4f/rcc.c b/lib/lm4f/rcc.c index 9b051b34..ee16de6c 100644 --- a/lib/lm4f/rcc.c +++ b/lib/lm4f/rcc.c @@ -92,7 +92,7 @@ Alexandru Gagniuc * internal 16MHz oscillator. * * 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 access this variable via * @code * rcc_get_system_clock_frequency(); * @endcode diff --git a/lib/lm4f/uart.c b/lib/lm4f/uart.c index c5e3e04e..f37907b4 100644 --- a/lib/lm4f/uart.c +++ b/lib/lm4f/uart.c @@ -256,7 +256,7 @@ void uart_clock_from_sysclk(uint32_t uart) * * \brief Sending and receiving data through the UART * - * Primitives for sending and recieving data are provided, @ref uart_send() and + * Primitives for sending and receiving data are provided, @ref uart_send() and * @ref uart_recv(). These primitives do not check if data can be transmitted * or wait for data. If waiting until data is available or can be transmitted is * desired, blocking primitives are also available, @ref uart_send_blocking() @@ -407,7 +407,7 @@ uint16_t uart_recv_blocking(uint32_t uart) * serviced_irq |= UART_INT_CTS; * } * - * // Clear the interupt flag for the processed IRQs + * // Clear the interrupt flag for the processed IRQs * uart_clear_interrupt_flag(UART0, serviced_irqs); * } * @endcode diff --git a/lib/stm32/common/crypto_common_f24.c b/lib/stm32/common/crypto_common_f24.c index 46cef6bd..22f329c6 100644 --- a/lib/stm32/common/crypto_common_f24.c +++ b/lib/stm32/common/crypto_common_f24.c @@ -93,7 +93,7 @@ void crypto_set_datatype(enum crypto_datatype datatype) } /** - * @brief Set the algoritm for Encryption/decryption + * @brief Set the algorithm for Encryption/decryption * *@param[in] mode enum crypto_mode Mode of execution */ diff --git a/lib/stm32/common/dma_common_l1f013.c b/lib/stm32/common/dma_common_l1f013.c index d705964d..0005c113 100644 --- a/lib/stm32/common/dma_common_l1f013.c +++ b/lib/stm32/common/dma_common_l1f013.c @@ -236,7 +236,7 @@ After the number of bytes/words to be transferred has been completed, the original transfer block size, memory and peripheral base addresses are reloaded and the process repeats. -@note This cannot be used with memory to memory mode, which is explictly +@note This cannot be used with memory to memory mode, which is explicitly disabled here. @param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2 diff --git a/lib/stm32/common/st_usbfs_core.c b/lib/stm32/common/st_usbfs_core.c index 171e2a28..09a6e22e 100644 --- a/lib/stm32/common/st_usbfs_core.c +++ b/lib/stm32/common/st_usbfs_core.c @@ -164,7 +164,7 @@ uint8_t st_usbfs_ep_stall_get(usbd_device *dev, uint8_t addr) void st_usbfs_ep_nak_set(usbd_device *dev, uint8_t addr, uint8_t nak) { (void)dev; - /* It does not make sence to force NAK on IN endpoints. */ + /* It does not make sense to force NAK on IN endpoints. */ if (addr & 0x80) { return; } diff --git a/lib/stm32/common/usart_common_all.c b/lib/stm32/common/usart_common_all.c index 14364623..4e42f2a9 100644 --- a/lib/stm32/common/usart_common_all.c +++ b/lib/stm32/common/usart_common_all.c @@ -64,7 +64,7 @@ void usart_set_baudrate(uint32_t usart, uint32_t baud) /* * Yes it is as simple as that. The reference manual is * talking about fractional calculation but it seems to be only - * marketting babble to sound awesome. It is nothing else but a + * marketing babble to sound awesome. It is nothing else but a * simple divider to generate the correct baudrate. * * Note: We round() the value rather than floor()ing it, for more diff --git a/lib/stm32/f0/adc.c b/lib/stm32/f0/adc.c index 7dbf84a9..ec2c7950 100644 --- a/lib/stm32/f0/adc.c +++ b/lib/stm32/f0/adc.c @@ -145,7 +145,7 @@ void adc_disable_discontinuous_mode(uint32_t adc) /*---------------------------------------------------------------------------*/ /** @brief ADC Set conversion operation mode * - * @note on SEQUENTIAL mode, the trigger event is neccesary to start conversion. + * @note on SEQUENTIAL mode, the trigger event is necessary to start conversion. * @par * * @param[in] adc Unsigned int32. ADC base address (@ref adc_reg_base) diff --git a/lib/usb/usb_efm32lg.c b/lib/usb/usb_efm32lg.c index f0b2cc3d..5768947c 100644 --- a/lib/usb/usb_efm32lg.c +++ b/lib/usb/usb_efm32lg.c @@ -102,7 +102,7 @@ static void efm32lg_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type, { /* * Configure endpoint address and type. Allocate FIFO memory for - * endpoint. Install callback funciton. + * endpoint. Install callback function. */ uint8_t dir = addr & 0x80; addr &= 0x7f; diff --git a/lib/usb/usb_fx07_common.c b/lib/usb/usb_fx07_common.c index a2fab525..edd10ada 100644 --- a/lib/usb/usb_fx07_common.c +++ b/lib/usb/usb_fx07_common.c @@ -44,7 +44,7 @@ void stm32fx07_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type, { /* * Configure endpoint address and type. Allocate FIFO memory for - * endpoint. Install callback funciton. + * endpoint. Install callback function. */ uint8_t dir = addr & 0x80; addr &= 0x7f; @@ -179,7 +179,7 @@ uint8_t stm32fx07_ep_stall_get(usbd_device *usbd_dev, uint8_t addr) void stm32fx07_ep_nak_set(usbd_device *usbd_dev, uint8_t addr, uint8_t nak) { - /* It does not make sence to force NAK on IN endpoints. */ + /* It does not make sense to force NAK on IN endpoints. */ if (addr & 0x80) { return; } diff --git a/lib/usb/usb_standard.c b/lib/usb/usb_standard.c index 5e851625..d94ceed9 100644 --- a/lib/usb/usb_standard.c +++ b/lib/usb/usb_standard.c @@ -193,7 +193,7 @@ static int usb_standard_get_descriptor(usbd_device *usbd_dev, return USBD_REQ_NOTSUPP; } - /* Ths string is returned as UTF16, hence the + /* This string is returned as UTF16, hence the * multiplication */ sd->bLength = strlen(usbd_dev->strings[array_idx]) * 2 + diff --git a/mk/README b/mk/README index 59efbbb5..cb792c3d 100644 --- a/mk/README +++ b/mk/README @@ -54,7 +54,7 @@ gcc ------------------------------------------------------------------------------- This module adds an extended support for GCC toolchain. This adds rules, -neccessary for compiling C and C++ files into elf binary, and rules for +necessary for compiling C and C++ files into elf binary, and rules for generation of bin, hex, or srec output files for flashing. Variables to control the build process (should be set in your makefile): @@ -109,7 +109,7 @@ OPENCM3_LIBNAME (replaced) ! Ensure that you have line 'LDLIBS += -l$(OPENCM3_LIBNAME)' in your makefile. ! Ensure that you have line 'LDFLAGS += -L$(OPENCM3_DIR)/lib' in your makefile. ! Ensure that you have rule '$(OPENCM3_DIR)/lib/lib$(OPENCM3_LIBNAME).a:' - to be the library archive succesfully built when needed. + to be the library archive successfully built when needed. Temporary variables that you should not use in your makefile: ------------------------------------------------------------- diff --git a/scripts/irq2nvic_h b/scripts/irq2nvic_h index e3aeea00..0a99603c 100755 --- a/scripts/irq2nvic_h +++ b/scripts/irq2nvic_h @@ -23,7 +23,7 @@ numbers. Code generation is chosen here because the resulting C code needs to be very repetetive (definition of the IRQ numbers, function prototypes, weak fallback definition and vector table definition), all being very repetitive. No portable -method to achive the same thing with C preprocessor is known to the author. +method to achieve the same thing with C preprocessor is known to the author. (Neither is any non-portable method, for that matter.)""" import sys @@ -149,7 +149,7 @@ def main(): remove = False infile = sys.argv[1] if not infile.startswith('./include/libopencm3/') or not infile.endswith('/irq.json'): - raise ValueError("Arguent must match ./include/libopencm3/**/irq.json") + raise ValueError("Argument must match ./include/libopencm3/**/irq.json") nvic_h = infile.replace('irq.json', 'nvic.h') vector_nvic_c = infile.replace('./include/libopencm3/', './lib/').replace('irq.json', 'vector_nvic.c') cmsis = infile.replace('irq.json', 'irqhandlers.h').replace('/libopencm3/', '/libopencmsis/')