From: Keith Packard Date: Wed, 27 Jun 2012 06:05:42 +0000 (-0700) Subject: altos: Make cc1111 radio control functions static X-Git-Tag: 1.0.9.6~31 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=33f8f7add27a02d24b0671da353b59762224c1ee altos: Make cc1111 radio control functions static No need to publish these; they're all private to cc1111 Signed-off-by: Keith Packard --- diff --git a/src/cc1111/ao_radio.c b/src/cc1111/ao_radio.c index 51ed369b..2c4a661e 100644 --- a/src/cc1111/ao_radio.c +++ b/src/cc1111/ao_radio.c @@ -260,7 +260,7 @@ ao_radio_general_isr(void) __interrupt 16 } } -void +static void ao_radio_set_packet(void) { uint8_t i; @@ -268,7 +268,7 @@ ao_radio_set_packet(void) RF[fixed_pkt_setup[i]] = fixed_pkt_setup[i+1]; } -void +static void ao_radio_idle(void) { if (RF_MARCSTATE != RF_MARCSTATE_IDLE) @@ -280,7 +280,9 @@ ao_radio_idle(void) } } -void +#define ao_radio_put() ao_mutex_put(&ao_radio_mutex) + +static void ao_radio_get(uint8_t len) { ao_config_get(); diff --git a/src/core/ao.h b/src/core/ao.h index 204c8530..c13029bf 100644 --- a/src/core/ao.h +++ b/src/core/ao.h @@ -505,15 +505,7 @@ void ao_radio_general_isr(void) ao_arch_interrupt(16); void -ao_radio_get(uint8_t len); - -#define ao_radio_put() ao_mutex_put(&ao_radio_mutex) - -void -ao_radio_set_packet(void); - -void -ao_radio_send(__xdata void *d, uint8_t size) __reentrant; +ao_radio_send(const __xdata void *d, uint8_t size) __reentrant; uint8_t ao_radio_recv(__xdata void *d, uint8_t size) __reentrant; @@ -537,9 +529,6 @@ ao_radio_rdf(uint8_t pkt_len); void ao_radio_rdf_abort(void); -void -ao_radio_idle(void); - void ao_radio_init(void);