diff options
author | Bdale Garbee <bdale@gag.com> | 2012-08-28 23:39:53 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2012-08-28 23:39:53 -0600 |
commit | 5ed88fb72c3e3ecf3333c700d838667db71cfbdc (patch) | |
tree | 3b371f563c0f7607f2fe53242673adb352b48514 /src/cc1111/ao_arch_funcs.h | |
parent | adbe64c5a9402b7c5075a444a12629131b663877 (diff) | |
parent | 621d0930244f25165d2ac5da596dcc87e253b965 (diff) |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Conflicts:
debian/control
Diffstat (limited to 'src/cc1111/ao_arch_funcs.h')
-rw-r--r-- | src/cc1111/ao_arch_funcs.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h index 0737e7ab..5e2fc13d 100644 --- a/src/cc1111/ao_arch_funcs.h +++ b/src/cc1111/ao_arch_funcs.h @@ -29,6 +29,15 @@ extern __xdata uint8_t ao_spi_mutex; UxGCR_ORDER_MSB | \ ((speed) << UxGCR_BAUD_E_SHIFT))) +#define ao_spi_get_slave(bus) do { \ + ao_mutex_get(&ao_spi_mutex); \ + ao_spi_set_speed(AO_SPI_SPEED_FAST); \ + } while (0) + +#define ao_spi_put_slave(bus) do { \ + ao_mutex_put(&ao_spi_mutex); \ + } while (0) + #define ao_spi_get_mask(reg,mask,bus,speed) do { \ ao_mutex_get(&ao_spi_mutex); \ ao_spi_set_speed(speed); \ @@ -88,3 +97,4 @@ ao_spi_init(void); #define token_paster(x,y) x ## y #define token_evaluator(x,y) token_paster(x,y) #define ao_enable_output(port,bit,pin,v) cc1111_enable_output(port,token_evaluator(port,DIR), token_evaluator(port,SEL), pin, bit, v) +#define ao_gpio_set(port, bit, pin, v) ((pin) = (v)) |