This moves the locking up above the global state variable uses so that
multiple radio users (as if we had any) won't collide.
Signed-off-by: Keith Packard <keithp@keithp.com>
-ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode);
+_ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode);
#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
static void
ao_radio_tone_run(struct ao_radio_tone *tones, int ntones)
{
static void
ao_radio_tone_run(struct ao_radio_tone *tones, int ntones)
{
ao_radio_tone = tones;
ao_radio_tone_current = 0;
ao_radio_tone_offset = 0;
ao_radio_tone = tones;
ao_radio_tone_current = 0;
ao_radio_tone_offset = 0;
- ao_radio_send_lots(ao_radio_tone_fill, AO_RADIO_MODE_RDF);
+ _ao_radio_send_lots(ao_radio_tone_fill, AO_RADIO_MODE_RDF);
+ ao_radio_put();
void
ao_radio_send(const void *d, uint8_t size)
{
void
ao_radio_send(const void *d, uint8_t size)
{
+ int i;
+
+ ao_radio_get();
ao_radio_send_len = ao_fec_encode(d, size, tx_data);
ao_radio_send_buf = tx_data;
ao_radio_send_len = ao_fec_encode(d, size, tx_data);
ao_radio_send_buf = tx_data;
- ao_radio_send_lots(ao_radio_send_fill, AO_RADIO_MODE_PACKET_TX);
+ _ao_radio_send_lots(ao_radio_send_fill, AO_RADIO_MODE_PACKET_TX);
+ ao_radio_put();
}
#define AO_RADIO_LOTS 64
static void
}
#define AO_RADIO_LOTS 64
static void
-ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
+_ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
{
uint8_t buf[AO_RADIO_LOTS], *b;
int cnt;
{
uint8_t buf[AO_RADIO_LOTS], *b;
int cnt;
uint8_t started = 0;
uint8_t fifo_space;
uint8_t started = 0;
uint8_t fifo_space;
fifo_space = CC115L_FIFO_SIZE;
ao_radio_done = 0;
ao_radio_fifo = 0;
fifo_space = CC115L_FIFO_SIZE;
ao_radio_done = 0;
ao_radio_fifo = 0;
ao_radio_idle();
ao_radio_wait_done();
ao_radio_pa_off();
ao_radio_idle();
ao_radio_wait_done();
ao_radio_pa_off();
}
void
ao_radio_send_aprs(ao_radio_fill_func fill)
{
}
void
ao_radio_send_aprs(ao_radio_fill_func fill)
{
- ao_radio_send_lots(fill, AO_RADIO_MODE_APRS);
+ ao_radio_get();
+ _ao_radio_send_lots(fill, AO_RADIO_MODE_APRS);
+ ao_radio_put();