sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged nuttx/arch into master

Browse Source
This commit is contained in:
Lok Tep 2015-11-11 16:56:19 +01:00
commit 4eed3afc79
4 changed files with 435 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/src/lpc43xx/lpc43_i2c.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/lpc43xx/lpc43_i2c.c
*
* Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Ported from from the LPC17 version:
@ -427,8 +427,15 @@ static int i2c_interrupt(int irq, FAR void *context)
case 0x08: /* A START condition has been transmitted. */
case 0x10: /* A Repeated START condition has been transmitted. */
putreg32(((I2C_M_READ & msg->flags) == I2C_M_READ)?I2C_READADDR8(msg->addr):I2C_WRITEADDR8(msg->addr), priv->base + LPC43_I2C_DAT_OFFSET); /* set address */
putreg32(I2C_CONCLR_STAC, priv->base + LPC43_I2C_CONCLR_OFFSET); /* clear start bit */
/* Set address */
putreg32(((I2C_M_READ & msg->flags) == I2C_M_READ) ?
I2C_READADDR8(msg->addr) :
I2C_WRITEADDR8(msg->addr), priv->base + LPC43_I2C_DAT_OFFSET);
/* Clear start bit */
putreg32(I2C_CONCLR_STAC, priv->base + LPC43_I2C_CONCLR_OFFSET);
break;
/* Write cases */

14
arch/arm/src/lpc43xx/lpc43_spi.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/lpc43xx/lpc43_spi.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -603,13 +603,16 @@ FAR struct spi_dev_s *lpc43_spiinitialize(int port)
FAR struct spi_dev_s *up_spiinitialize(int port)
{
if (port) {
#if ( defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1) )
if (port)
{
#if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1)
return lpc43_sspinitialize(port - 1);
#else
return NULL;
#endif
} else {
}
else
{
#if defined(CONFIG_LPC43_SPI)
return lpc43_spiinitialize(port);
#else
@ -617,6 +620,3 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
#endif
}
}

38
arch/arm/src/lpc43xx/lpc43_ssp.c
View File

@ -137,6 +137,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer
static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t nwords);
static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nwords);
#endif
/* Initialization */
#ifdef CONFIG_LPC43_SSP0
@ -537,8 +538,30 @@ static uint16_t ssp_send(FAR struct spi_dev_s *dev, uint16_t wd)
return (uint16_t)regval;
}
/****************************************************************************
* Name: ssp_exchange
*
* Description:
* Exahange a block of data from SPI. Required.
*
* Input Parameters:
* dev - Device-specific state data
* txbuffer - A pointer to the buffer of data to be sent
* rxbuffer - A pointer to the buffer in which to receive data
* nwords - the length of data that to be exchanged in units of words.
* The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is
* packed into uint8_t's; if nbits >8, the data is packed into
* uint16_t's
*
* Returned Value:
* None
*
****************************************************************************/
static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
FAR void *rxbuffer, size_t nwords) {
FAR void *rxbuffer, size_t nwords)
{
FAR struct lpc43_sspdev_s *priv = (FAR struct lpc43_sspdev_s *)dev;
union
{
@ -602,6 +625,7 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
{
*rx.p8++ = (uint8_t)data;
}
rxpending--;
}
}
@ -619,12 +643,14 @@ static void ssp_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
* nwords - the length of data to send from the buffer in number of words.
* The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is
* packed into uint8_t's; if nbits >8, the data is packed into uint16_t's
* packed into uint8_t's; if nbits >8, the data is packed into
* uint16_t's
*
* Returned Value:
* None
*
****************************************************************************/
#ifndef CONFIG_SPI_EXCHANGE
static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t nwords)
{
@ -643,7 +669,8 @@ static void ssp_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size
* nwords - the length of data that can be received in the buffer in number
* of words. The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is
* packed into uint8_t's; if nbits >8, the data is packed into uint16_t's
* packed into uint8_t's; if nbits >8, the data is packed into
* uint16_t's
*
* Returned Value:
* None
@ -654,10 +681,8 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
{
return ssp_exchange(dev, NULL, buffer, nwords);
}
#endif /* !CONFIG_SPI_EXCHANGE */
#endif
#ifdef CONFIG_LPC43_SSP0
/****************************************************************************
* Name: lpc43_ssp0initialize
*
@ -672,6 +697,7 @@ static void ssp_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
*
****************************************************************************/
#ifdef CONFIG_LPC43_SSP0
static inline FAR struct lpc43_sspdev_s *lpc43_ssp0initialize(void)
{
irqstate_t flags;

130
arch/arm/src/lpc43xx/lpc43_tickless_rit.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/src/lpc43/lpc43_rit.c
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -40,7 +40,6 @@
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
@ -80,10 +79,10 @@ static uint32_t COMMON_DEV;
static uint32_t MIN_TICKS;
static uint32_t MIN_NSEC;
static uint32_t RESET_TICKS = 1000; /* ticks to add to force a reset */
static uint32_t RESET_TICKS = 1000; /* Ticks to add to force a reset */
static struct timespec base_ts; /* time base */
static uint32_t base_rest; /* rest of ticks that is < MIN_TICKS*/
static struct timespec base_ts; /* Time base */
static uint32_t base_rest; /* Rest of ticks that is < MIN_TICKS*/
static struct timespec alarm_time_ts; /* alarmTime to set on next interrupt, used if not already armed */
@ -91,7 +90,7 @@ static bool alarm_time_set = false; /* true if alarm_time set and need to be pro
static bool call = false; /* true if callback should be called on next interrupt */
static bool forced_int = false; /* true if interrupt was forced with mask, no reset */
static bool armed = false; /* true if alarm is armed for next match */
static uint32_t synch = 0; /* synch all calls, recursion is possible */
static uint32_t synch = 0; /* Synch all calls, recursion is possible */
static irqstate_t g_flags;
static uint32_t ctrl_cache;
@ -102,7 +101,7 @@ static uint32_t compare_cache;
* Private Functions
****************************************************************************/
/* some timer HW functions */
/* Some timer HW functions */
static inline void lpc43_tl_set_counter(uint32_t value)
{
@ -149,9 +148,8 @@ static inline bool lpc43_tl_get_ctrl_bit (uint32_t bit)
static inline void lpc43_tl_set_ctrl_bit(uint32_t bit, bool value)
{
if ( lpc43_tl_get_ctrl_bit(bit) != value ) {
if (lpc43_tl_get_ctrl_bit(bit) != value)
{
if (value)
{
ctrl_cache |= bit;
@ -195,7 +193,8 @@ static inline bool lpc43_tl_get_enable (void)
return ((getreg32(LPC43_RIT_CTRL) & RIT_CTRL_INT)?true:false);
}
/* converters */
/* Converters */
static uint32_t commonDev(uint32_t a, uint32_t b)
{
while (b != 0)
@ -265,9 +264,9 @@ static inline uint32_t lpc43_tl_ts2tick ( FAR const struct timespec *ts)
return (ts->tv_sec*LPC43_CCLK + (ts->tv_nsec/MIN_NSEC*MIN_TICKS));
}
static uint32_t lpc43_tl_tick2ts (uint32_t ticks, FAR struct timespec *ts, bool with_rest)
static uint32_t lpc43_tl_tick2ts(uint32_t ticks, FAR struct timespec *ts,
bool with_rest)
{
uint32_t ticks_whole;
uint32_t ticks_rest = 0;
@ -276,7 +275,6 @@ static inline uint32_t lpc43_tl_ts2tick ( FAR const struct timespec *ts)
uint32_t ticks_mult = ticks/MIN_TICKS;
ticks_whole = ticks_mult*MIN_TICKS;
ticks_rest = ticks - ticks_whole;
}
else
{
@ -289,21 +287,23 @@ static inline uint32_t lpc43_tl_ts2tick ( FAR const struct timespec *ts)
return ticks_rest;
}
/* logic functions */
/* Logic functions */
static inline void lpc43_tl_sync_up (void) {
static inline void lpc43_tl_sync_up(void)
{
irqstate_t flags;
flags = irqsave();
if (synch == 0)
{
g_flags = flags;
}
synch++;
}
static inline void lpc43_tl_sync_down (void) {
static inline void lpc43_tl_sync_down(void)
{
synch--;
if (synch == 0)
{
@ -311,7 +311,7 @@ static inline void lpc43_tl_sync_down (void) {
}
}
/* assuming safe timer state, force interrupt, no reset possible */
/* Assuming safe timer state, force interrupt, no reset possible */
static inline void lpc43_tl_force_int(void)
{
@ -321,17 +321,16 @@ static inline void lpc43_tl_force_int (void)
lpc43_tl_set_compare(UINT32_MAX);
}
/* init all vars, forced_int should not be cleared */
/* Init all vars, forced_int should not be cleared */
static inline void lpc43_tl_init_timer_vars(void)
{
alarm_time_set = false;
call = false;
armed = false;
}
/* calc RESET_TICKS and set compare to TO_RESET */
/* Calc RESET_TICKS and set compare to TO_RESET */
static void lpc43_tl_calibrate_init(void)
{
@ -341,17 +340,16 @@ static void lpc43_tl_calibrate_init (void)
counter_after = TO_RESET + counter;
counter_after = counter_after - counter;
/*shift to toReset*/
/* Shift to to Reset */
lpc43_tl_set_compare(counter_after);
counter_after = lpc43_tl_get_counter();
RESET_TICKS = (counter_after - counter) * 2;
}
/* process current and set timer in default safe state */
/* Process current and set timer in default safe state */
static void lpc43_tl_save_timer(bool from_isr)
{
@ -364,12 +362,11 @@ static void lpc43_tl_save_timer (bool from_isr)
}
else
{
/*process reset if any*/
/* Process reset if any */
uint32_t match = lpc43_tl_get_compare();
/*move to end, no resets during processing*/
/* Move to end, no resets during processing */
lpc43_tl_set_compare(UINT32_MAX);
lpc43_tl_set_mask(0);
@ -379,15 +376,17 @@ static void lpc43_tl_save_timer (bool from_isr)
if (lpc43_tl_get_reset_on_match()) /*was reset ?*/
{
struct timespec match_ts;
base_rest = lpc43_tl_tick2ts(match + base_rest, &match_ts,true);
base_rest = lpc43_tl_tick2ts(match + base_rest,
&match_ts,true);
lpc43_tl_add(&base_ts, &match_ts,&base_ts);
}
lpc43_tl_clear_interrupt();
}
}
}
/* assuming safe timer state, true if set, false - time is in the past */
/* Assuming safe timer state, true if set, false - time is in the past */
static bool lpc43_tl_set_safe_compare(uint32_t compare_to_set)
{
@ -402,14 +401,16 @@ static bool lpc43_tl_set_safe_compare (uint32_t compare_to_set)
lpc43_tl_set_compare(compare_to_set);
//check if ok
/* Check if ok */
bool reset = lpc43_tl_get_interrupt();
uint32_t counter = lpc43_tl_get_counter();
bool reset_after = lpc43_tl_get_interrupt();
if (reset != reset_after)
{
//was a reset get new counter
/* Was a reset get new counter */
counter = lpc43_tl_get_counter();
}
@ -423,25 +424,25 @@ static bool lpc43_tl_set_safe_compare (uint32_t compare_to_set)
return false;
}
}
/* assuming safe timer state, set_safe_compare in loop */
/* Assuming safe timer state, set_safe_compare in loop */
static void lpc43_tl_looped_forced_set_compare(void)
{
uint32_t i = 1;
bool result = lpc43_tl_set_safe_compare(
lpc43_tl_get_counter() + RESET_TICKS); /* like in calibrateInit */
while (!result)
{
i++;
result = lpc43_tl_set_safe_compare(
lpc43_tl_get_counter() + RESET_TICKS * i);
};
}
}
/* assuming safe timer state, true if set, false - time is in the past */
/* Assuming safe timer state, true if set, false - time is in the past */
static bool lpc43_tl_set_calc_arm(uint32_t curr, uint32_t to_set, bool arm)
{
@ -475,12 +476,11 @@ static bool lpc43_tl_set_calc_arm (uint32_t curr, uint32_t to_set, bool arm)
return set;
}
/* assuming safe timer state, try to set compare for normal operation */
/* Assuming safe timer state, try to set compare for normal operation */
static void lpc43_tl_set_default_compare(uint32_t curr)
{
bool result = lpc43_tl_set_calc_arm (curr, UINT32_MAX,
false);
bool result = lpc43_tl_set_calc_arm(curr, UINT32_MAX, false);
if (!result)
{
result = lpc43_tl_set_calc_arm(lpc43_tl_get_counter(), UINT32_MAX,
@ -490,10 +490,12 @@ static void lpc43_tl_set_default_compare (uint32_t curr)
lpc43_tl_looped_forced_set_compare();
}
}
}
/* calculates ticks to set from alarm_time_ts and base_ts/base_rest, UINT32_MAX if overflow */
/* Calculates ticks to set from alarm_time_ts and base_ts/base_rest,
* UINT32_MAX if overflow.
*/
static inline uint32_t lpc43_tl_calc_to_set(void)
{
struct timespec diff_ts;
@ -510,16 +512,17 @@ static inline uint32_t lpc43_tl_calc_to_set (void)
{
return UINT32_MAX;
}
}
/* assuming safe timer state, used by isr: sets default compare , calls alarm */
/* Assuming safe timer state, used by isr: sets default compare,
* calls alarm.
*/
static inline void lpc43_tl_alarm(uint32_t curr)
{
lpc43_tl_init_timer_vars();
lpc43_tl_set_default_compare(curr);
#ifdef CONFIG_SCHED_TICKLESS_ALARM
struct timespec ts;
up_timer_gettime(&ts);
@ -529,7 +532,7 @@ static inline void lpc43_tl_alarm (uint32_t curr)
#endif
}
/* interrupt handler */
/* Interrupt handler */
static int lpc43_tl_isr(int irq, FAR void *context)
{
@ -586,7 +589,6 @@ static int lpc43_tl_isr (int irq, FAR void *context)
return OK;
}
/****************************************************************************
* Public Functions
****************************************************************************/
@ -630,39 +632,42 @@ void up_timer_initialize (void)
lpc43_tl_calibrate_init();
irqrestore(flags);
}
/* No reg changes, only processing */
/* no reg changes, only processing */
int up_timer_gettime(FAR struct timespec *ts)
{
lpc43_tl_sync_up();
/* order of calls is important, reset can come during processing */
/* Order of calls is important, reset can come during processing */
bool reset = lpc43_tl_get_interrupt();
uint32_t count = lpc43_tl_get_counter();
/* not processed reset can exist */
/* Not processed reset can exist */
if (lpc43_tl_get_reset_on_match())
{
bool resetAfter = lpc43_tl_get_interrupt();
if (reset != resetAfter) /* was a reset during processing? get new counter */
/* Was a reset during processing? get new counter */
if (reset != resetAfter)
{
count = lpc43_tl_get_counter();
}
if (resetAfter)
{
count += lpc43_tl_get_compare (); /* count should be smaller then UINT32_MAX-TO_END -> no overflow */
/* Count should be smaller then UINT32_MAX-TO_END -> no overflow */
count += lpc43_tl_get_compare();
}
}
struct timespec count_ts;
lpc43_tl_tick2ts(count + base_rest,&count_ts,false);
lpc43_tl_add(&base_ts,&count_ts,ts);
@ -672,18 +677,19 @@ int up_timer_gettime (FAR struct timespec *ts)
return OK;
}
int up_alarm_cancel(FAR struct timespec *ts)
{
lpc43_tl_sync_up();
/*no reg changes, only variables logic*/
/* No reg changes, only variables logic */
if ( ts != NULL ) {
if (ts != NULL)
{
up_timer_gettime(ts);
}
/* let default setup will be done in interrupt handler or up_alarm_start */
/* Let default setup will be done in interrupt handler or up_alarm_start */
lpc43_tl_init_timer_vars();
lpc43_tl_sync_down();
@ -708,22 +714,21 @@ int up_alarm_start (FAR const struct timespec *ts)
if (toSet > curr)
{
if (toSet > TO_END) /* future set */
if (toSet > TO_END) /* Future set */
{
lpc43_tl_set_default_compare(curr);
}
else
{
bool set = lpc43_tl_set_calc_arm(curr, toSet, true);
if (!set) /* signal call, force interrupt handler */
if (!set) /* Signal call, force interrupt handler */
{
call = true;
lpc43_tl_force_int();
}
}
}
else /* signal call, force interrupt handler */
else /* Signal call, force interrupt handler */
{
call = true;
lpc43_tl_force_int();
@ -735,7 +740,6 @@ int up_alarm_start (FAR const struct timespec *ts)
}
#ifndef CONFIG_SCHED_TICKLESS_ALARM
int up_timer_cancel(FAR struct timespec *ts)
{
lpc43_tl_sync_up();
@ -755,7 +759,6 @@ int up_timer_cancel(FAR struct timespec *ts)
int up_timer_start(FAR const struct timespec *ts)
{
lpc43_tl_sync_up();
struct timespec abs_ts;
@ -769,5 +772,4 @@ int up_timer_start(FAR const struct timespec *ts)
}
#endif /* CONFIG_SCHED_TICKLESS_ALARM */
#endif /* CONFIG_SCHED_TICKLESS */