projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: cc1200: use FIFO threshold pin output for APRS buffering
[fw/altos]
/
src
/
stm
/
ao_arch_funcs.h
diff --git
a/src/stm/ao_arch_funcs.h
b/src/stm/ao_arch_funcs.h
index 5a7782dea8913779c8aa01cb37eb93cdec8387bc..a796891d53b24b9fe4b40179ecee94543029a0eb 100644
(file)
--- a/
src/stm/ao_arch_funcs.h
+++ b/
src/stm/ao_arch_funcs.h
@@
-80,7
+80,13
@@
void
ao_spi_send_fixed(uint8_t value, uint16_t len, uint8_t spi_index);
void
ao_spi_send_fixed(uint8_t value, uint16_t len, uint8_t spi_index);
void
-ao_spi_send_sync(void *block, uint16_t len, uint8_t spi_index);
+ao_spi_send_sync(const void *block, uint16_t len, uint8_t spi_index);
+
+void
+ao_spi_start_bytes(uint8_t spi_index);
+
+void
+ao_spi_stop_bytes(uint8_t spi_index);
static inline void
ao_spi_send_byte(uint8_t byte, uint8_t spi_index)
static inline void
ao_spi_send_byte(uint8_t byte, uint8_t spi_index)
@@
-96,18
+102,34
@@
ao_spi_send_byte(uint8_t byte, uint8_t spi_index)
break;
}
break;
}
- stm_spi->cr2 = ((0 << STM_SPI_CR2_TXEIE) |
- (0 << STM_SPI_CR2_RXNEIE) |
- (0 << STM_SPI_CR2_ERRIE) |
- (0 << STM_SPI_CR2_SSOE) |
- (0 << STM_SPI_CR2_TXDMAEN) |
- (0 << STM_SPI_CR2_RXDMAEN));
-
- /* Clear RXNE */
+ while (!(stm_spi->sr & (1 << STM_SPI_SR_TXE)))
+ ;
+ stm_spi->dr = byte;
+ while (!(stm_spi->sr & (1 << STM_SPI_SR_RXNE)))
+ ;
(void) stm_spi->dr;
(void) stm_spi->dr;
+}
- while (!(stm_spi->sr & (1 << STM_SPI_SR_TXE)));
- stm_spi->dr = byte;
+static inline uint8_t
+ao_spi_recv_byte(uint8_t spi_index)
+{
+ struct stm_spi *stm_spi;
+
+ switch (AO_SPI_INDEX(spi_index)) {
+ case 0:
+ stm_spi = &stm_spi1;
+ break;
+ case 1:
+ stm_spi = &stm_spi2;
+ break;
+ }
+
+ while (!(stm_spi->sr & (1 << STM_SPI_SR_TXE)))
+ ;
+ stm_spi->dr = 0xff;
+ while (!(stm_spi->sr & (1 << STM_SPI_SR_RXNE)))
+ ;
+ return stm_spi->dr;
}
void
}
void
@@
-249,9
+271,6
@@
ao_dma_start(uint8_t index);
void
ao_dma_done_transfer(uint8_t index);
void
ao_dma_done_transfer(uint8_t index);
-void
-ao_dma_abort(uint8_t index);
-
void
ao_dma_alloc(uint8_t index);
void
ao_dma_alloc(uint8_t index);
@@
-343,6
+362,14
@@
ao_arch_memory_barrier() {
asm volatile("" ::: "memory");
}
asm volatile("" ::: "memory");
}
+static inline void
+ao_arch_irq_check(void) {
+ uint32_t primask;
+ asm("mrs %0,primask" : "=&r" (primask));
+ if ((primask & 1) == 0)
+ ao_panic(AO_PANIC_IRQ);
+}
+
#if HAS_TASK
static inline void
ao_arch_init_stack(struct ao_task *task, void *start)
#if HAS_TASK
static inline void
ao_arch_init_stack(struct ao_task *task, void *start)
@@
-391,13
+418,6
@@
static inline void ao_arch_save_stack(void) {
static inline void ao_arch_restore_stack(void) {
uint32_t sp;
static inline void ao_arch_restore_stack(void) {
uint32_t sp;
- uint32_t control;
-
- asm("mrs %0,control" : "=&r" (control));
- control |= (1 << 1);
- asm("msr control,%0" : : "r" (control));
- asm("isb");
-
sp = (uint32_t) ao_cur_task->sp;
/* Switch stacks */
sp = (uint32_t) ao_cur_task->sp;
/* Switch stacks */
@@
-454,14
+474,7
@@
static inline void ao_arch_start_scheduler(void) {
}
#endif
}
#endif
-static inline void ao_arch_isr_stack(void) {
- uint32_t control;
-
- asm("mrs %0,control" : "=&r" (control));
- control &= ~(1 << 1);
- asm("msr control,%0" : : "r" (control));
- asm("isb");
-}
+#define ao_arch_isr_stack()
#endif
#endif