Skip to content

Commit

Permalink
cpu/lpc23xx: rename lpc2387 to lpc23xx
Browse files Browse the repository at this point in the history
  • Loading branch information
aabadie committed Jul 16, 2020
1 parent ea8e867 commit 829b16b
Show file tree
Hide file tree
Showing 30 changed files with 16 additions and 16 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/lpc2387/clocks.c → cpu/lpc23xx/clocks.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "board.h"
#include "cpu.h"
#include "periph_conf.h"
#include "lpc2387.h"
#include "lpc23xx.h"

#define CL_CPU_DIV 4

Expand Down
4 changes: 2 additions & 2 deletions cpu/lpc2387/cpu.c → cpu/lpc23xx/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "stdio_base.h"
#include "periph/init.h"

void lpc2387_pclk_scale(uint32_t source, uint32_t target, uint32_t *pclksel, uint32_t *prescale)
void lpc23xx_pclk_scale(uint32_t source, uint32_t target, uint32_t *pclksel, uint32_t *prescale)
{
uint32_t pclkdiv;
*prescale = source / target;
Expand Down Expand Up @@ -52,7 +52,7 @@ void cpu_clock_scale(uint32_t source, uint32_t target, uint32_t *prescale)
{
uint32_t pclksel;

lpc2387_pclk_scale(source, target, &pclksel, prescale);
lpc23xx_pclk_scale(source, target, &pclksel, prescale);

PCLKSEL0 = (PCLKSEL0 & ~(BIT2 | BIT3)) | (pclksel << 2); /* timer 0 */
PCLKSEL0 = (PCLKSEL0 & ~(BIT4 | BIT5)) | (pclksel << 4); /* timer 1 */
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions cpu/lpc2387/include/cpu.h → cpu/lpc23xx/include/cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <stdio.h>
#include <stdbool.h>

#include "lpc2387.h"
#include "lpc23xx.h"
#include "arm_cpu.h"

#ifdef __cplusplus
Expand All @@ -41,7 +41,7 @@ void cpu_init_mam(void);
/**
* @brief Scale lpc2387 cpu speed
*/
void lpc2387_pclk_scale(uint32_t source, uint32_t target, uint32_t *pclksel, uint32_t *prescale);
void lpc23xx_pclk_scale(uint32_t source, uint32_t target, uint32_t *pclksel, uint32_t *prescale);

/**
* @brief Initialize lpc2387 cpu clocks
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* Parts taken from FeuerWhere-Project, lpc2387.h.
*/

#ifndef LPC2387_H
#define LPC2387_H
#ifndef LPC23XX_H
#define LPC23XX_H

#include "vendor/lpc23xx.h"
#include "arm7_common.h"
Expand Down Expand Up @@ -154,4 +154,4 @@ extern "C" {
}
#endif

#endif /* LPC2387_H */
#endif /* LPC23XX_H */
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
*
******************************************************************************/

#ifndef LPC23XX_H
#define LPC23XX_H
#ifndef LPC23XX_VENDOR_H
#define LPC23XX_VENDOR_H

#include <stdint.h>

Expand Down Expand Up @@ -1256,4 +1256,4 @@ with the spec. update in USB Device Section. */
}
#endif

#endif /* LPC23XX_H */
#endif /* LPC23XX_VENDOR_H */
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/lpc2387/lpc23xx-iap.c → cpu/lpc23xx/lpc23xx-iap.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "irq.h"
#include "flashrom.h"
#include "iap.h"
#include "lpc2387.h"
#include "lpc23xx.h"

#define ENABLE_DEBUG (0)
#include "debug.h"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/lpc2387/periph/i2c.c → cpu/lpc23xx/periph/i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void i2c_release(i2c_t dev)
static void _set_baud(lpc23xx_i2c_t *i2c, uint32_t baud)
{
uint32_t pclksel, prescale;
lpc2387_pclk_scale(CLOCK_CORECLOCK, baud, &pclksel, &prescale);
lpc23xx_pclk_scale(CLOCK_CORECLOCK, baud, &pclksel, &prescale);

switch ((uint32_t)i2c) {
case I2C0_BASE_ADDR:
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cpu/lpc2387/periph/rtc.c → cpu/lpc23xx/periph/rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/* cpu */
#include "periph/rtc.h"
#include "VIC.h"
#include "lpc2387.h"
#include "lpc23xx.h"

#define ENABLE_DEBUG (0)
#include "debug.h"
Expand Down
2 changes: 1 addition & 1 deletion cpu/lpc2387/periph/spi.c → cpu/lpc23xx/periph/spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ int spi_acquire(spi_t bus, spi_cs_t cs, spi_mode_t mode, spi_clk_t clk)
dev->CR0 = 7;

/* configure bus clock */
lpc2387_pclk_scale(CLOCK_CORECLOCK / 1000, (uint32_t)clk, &pclksel, &cpsr);
lpc23xx_pclk_scale(CLOCK_CORECLOCK / 1000, (uint32_t)clk, &pclksel, &cpsr);

switch ((uint32_t)dev) {
case SSP0_BASE_ADDR:
Expand Down
2 changes: 1 addition & 1 deletion cpu/lpc2387/periph/timer.c → cpu/lpc23xx/periph/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ int timer_init(tim_t tim, unsigned long freq, timer_cb_t cb, void *arg)
}

uint32_t scale, prescale;
lpc2387_pclk_scale(CLOCK_PCLK, freq, &scale, &prescale);
lpc23xx_pclk_scale(CLOCK_PCLK, freq, &scale, &prescale);

/* save the callback */
isr_ctx[tim].cb = cb;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 829b16b

Please sign in to comment.