altos: Eliminate 'pin' field from GPIO functions

This was used with the 8051 bit-addressing mode to provide
single-instruction access to GPIO pins.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/attiny/ao_arch_funcs.h b/src/attiny/ao_arch_funcs.h
index 35901154b8473e64e01a23fdfe0654256335b765..69b259d9419c34b6c8c24951605f03a8a82dc070 100644 (file)
--- a/src/attiny/ao_arch_funcs.h
+++ b/src/attiny/ao_arch_funcs.h
@@ -28,21 +28,21 @@
                (reg) |= (mask);                \
        } while (0)
 
                (reg) |= (mask);                \
        } while (0)
 

-#define ao_spi_get_bit(reg,bit,pin,bus,speed) ao_spi_get_mask(reg,(1<<(bit)),bus,speed)
+#define ao_spi_get_bit(reg,bit,bus,speed) ao_spi_get_mask(reg,(1<<(bit)),bus,speed)

 
 

-#define ao_spi_put_bit(reg,bit,pin,bus) ao_spi_put_mask(reg,(1<<(bit)),bus)
+#define ao_spi_put_bit(reg,bit,bus) ao_spi_put_mask(reg,(1<<(bit)),bus)

 
 #define ao_gpio_token_paster(x,y)              x ## y
 #define ao_gpio_token_evaluator(x,y)   ao_gpio_token_paster(x,y)
 
 
 #define ao_gpio_token_paster(x,y)              x ## y
 #define ao_gpio_token_evaluator(x,y)   ao_gpio_token_paster(x,y)
 

-#define ao_gpio_set(port, bit, pin, v) do {    \
+#define ao_gpio_set(port, bit, v) do { \

                if (v)                          \
                        PORTB |= (1 << bit);    \
                else                            \
                        PORTB &= ~(1 << bit);   \
        } while (0)
 
                if (v)                          \
                        PORTB |= (1 << bit);    \
                else                            \
                        PORTB &= ~(1 << bit);   \
        } while (0)
 

-#define ao_gpio_get(port, bit, pin)    ((PORTB >> (bit)) & 1)
+#define ao_gpio_get(port, bit) ((PORTB >> (bit)) & 1)

 
 /*
  * The SPI mutex must be held to call either of these
 
 /*
  * The SPI mutex must be held to call either of these


@@ -50,8 +50,8 @@
  * from chip select low to chip select high
  */
 
  * from chip select low to chip select high
  */
 

-#define ao_enable_output(port, bit, pin, v) do {                       \
-               ao_gpio_set(port, bit, pin, v);                         \
+#define ao_enable_output(port, bit, v) do {                    \
+               ao_gpio_set(port, bit, v);                              \

                ao_gpio_token_evaluator(DDR,port) |= (1 << bit);        \
        } while (0)
 
                ao_gpio_token_evaluator(DDR,port) |= (1 << bit);        \
        } while (0)
 

diff --git a/src/avr/ao_arch_funcs.h b/src/avr/ao_arch_funcs.h
index dc2486605acedae5cdc561e1f662950ea299d98d..f2a58af017282534b2071ed37e914a4fb106e2a7 100644 (file)
--- a/src/avr/ao_arch_funcs.h
+++ b/src/avr/ao_arch_funcs.h
@@ -32,12 +32,12 @@ extern uint8_t      ao_spi_mutex;
                ao_mutex_put(&ao_spi_mutex);    \
        } while (0)
 
                ao_mutex_put(&ao_spi_mutex);    \
        } while (0)
 

-#define ao_spi_get_bit(reg,bit,pin,bus,speed) do {     \
+#define ao_spi_get_bit(reg,bit,bus,speed) do { \

                ao_mutex_get(&ao_spi_mutex);    \
                (pin) = 0;                      \
        } while (0)
 
                ao_mutex_get(&ao_spi_mutex);    \
                (pin) = 0;                      \
        } while (0)
 

-#define ao_spi_put_bit(reg,bit,pin,bus) do {   \
+#define ao_spi_put_bit(reg,bit,bus) do {       \

                (pin) = 1;                      \
                ao_mutex_put(&ao_spi_mutex);    \
        } while (0)
                (pin) = 1;                      \
                ao_mutex_put(&ao_spi_mutex);    \
        } while (0)


@@ -46,7 +46,7 @@ extern uint8_t        ao_spi_mutex;
 #define ao_gpio_token_paster(x,y)              x ## y
 #define ao_gpio_token_evaluator(x,y)   ao_gpio_token_paster(x,y)
 
 #define ao_gpio_token_paster(x,y)              x ## y
 #define ao_gpio_token_evaluator(x,y)   ao_gpio_token_paster(x,y)
 

-#define ao_gpio_set(port, bit, pin, v) do {                            \
+#define ao_gpio_set(port, bit, v) do {                         \

                if (v)                                                  \
                        (ao_gpio_token_evaluator(PORT,port)) |= (1 << bit); \
                else                                                    \
                if (v)                                                  \
                        (ao_gpio_token_evaluator(PORT,port)) |= (1 << bit); \
                else                                                    \


@@ -59,8 +59,8 @@ extern uint8_t        ao_spi_mutex;
  * from chip select low to chip select high
  */
 
  * from chip select low to chip select high
  */
 

-#define ao_enable_output(port, bit, pin, v) do {                       \
-               ao_gpio_set(port, bit, pin, v);                         \
+#define ao_enable_output(port, bit, v) do {                    \
+               ao_gpio_set(port, bit, v);                              \

                ao_gpio_token_evaluator(DDR,port) |= (1 << bit);        \
        } while (0)
 
                ao_gpio_token_evaluator(DDR,port) |= (1 << bit);        \
        } while (0)
 

diff --git a/src/drivers/ao_btm.c b/src/drivers/ao_btm.c
index 2930d00e4c26ab48d6e99f01ae097c5c137f8099..04bf413890e349014f0448b12bbedfef892d1841 100644 (file)
--- a/src/drivers/ao_btm.c
+++ b/src/drivers/ao_btm.c
@@ -347,7 +347,7 @@ ao_btm_check_link()
                );
 #else
        ao_arch_block_interrupts();
                );
 #else
        ao_arch_block_interrupts();

-       if (ao_gpio_get(AO_BTM_INT_PORT, AO_BTM_INT_PIN, AO_BTM_INT) == 0) {
+       if (ao_gpio_get(AO_BTM_INT_PORT, AO_BTM_INT_PIN) == 0) {

                ao_btm_connected = 1;
        } else {
                ao_btm_connected = 0;
                ao_btm_connected = 1;
        } else {
                ao_btm_connected = 0;


@@ -455,7 +455,7 @@ ao_btm_init (void)
        ao_serial_btm_set_speed(AO_SERIAL_SPEED_19200);
 
 #ifdef AO_BTM_RESET_PORT
        ao_serial_btm_set_speed(AO_SERIAL_SPEED_19200);
 
 #ifdef AO_BTM_RESET_PORT

-       ao_enable_output(AO_BTM_RESET_PORT,AO_BTM_RESET_PIN,AO_BTM_RESET,0);
+       ao_enable_output(AO_BTM_RESET_PORT,AO_BTM_RESET_PIN,0);

 #endif
 
 #ifdef AO_BTM_INT_PORT
 #endif
 
 #ifdef AO_BTM_INT_PORT

diff --git a/src/drivers/ao_button.c b/src/drivers/ao_button.c
index f6a9676bc481ad934b6d794625092a84f531f5d0..c8103e884d3cd47bfacb5909a0034acafa41a325 100644 (file)
--- a/src/drivers/ao_button.c
+++ b/src/drivers/ao_button.c
@@ -37,7 +37,6 @@ static struct ao_button_state ao_button_state[AO_BUTTON_COUNT];
 
 #define port(q)        AO_BUTTON_ ## q ## _PORT
 #define bit(q) AO_BUTTON_ ## q
 
 #define port(q)        AO_BUTTON_ ## q ## _PORT
 #define bit(q) AO_BUTTON_ ## q

-#define pin(q) AO_BUTTON_ ## q ## _PIN

 
 #ifndef AO_BUTTON_INVERTED
 #define AO_BUTTON_INVERTED     1
 
 #ifndef AO_BUTTON_INVERTED
 #define AO_BUTTON_INVERTED     1


@@ -45,9 +44,9 @@ static struct ao_button_state ao_button_state[AO_BUTTON_COUNT];
 
 #if AO_BUTTON_INVERTED
 /* pins are inverted */
 
 #if AO_BUTTON_INVERTED
 /* pins are inverted */

-#define ao_button_value(b)     !ao_gpio_get(port(b), bit(b), pin(b))
+#define ao_button_value(b)     !ao_gpio_get(port(b), bit(b))

 #else
 #else

-#define ao_button_value(b)     ao_gpio_get(port(b), bit(b), pin(b))
+#define ao_button_value(b)     ao_gpio_get(port(b), bit(b))

 #endif
 
 static uint8_t
 #endif
 
 static uint8_t

diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index aea0a3fe0cd49e1a93b86993da1afdff6badc6b9..b1a1377875c0d17be8c9c65185e89bbdd8b35fbc 100644 (file)
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@ -208,7 +208,7 @@ ao_radio_fifo_write_fixed(uint8_t data, uint8_t len)
 static uint8_t
 ao_radio_int_pin(void)
 {
 static uint8_t
 ao_radio_int_pin(void)
 {

-       return ao_gpio_get(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN, AO_CC1120_INT);
+       return ao_gpio_get(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);

 }
 
 #if CC1120_DEBUG
 }
 
 #if CC1120_DEBUG

diff --git a/src/drivers/ao_cc1200.c b/src/drivers/ao_cc1200.c
index 45f5711ee3e465c18176543c8c1d58b5d97d98fb..105e0d50a80aa072a2147248d1cf57edd4a0e8e2 100644 (file)
--- a/src/drivers/ao_cc1200.c
+++ b/src/drivers/ao_cc1200.c
@@ -192,7 +192,7 @@ ao_radio_fifo_write_fixed(uint8_t data, uint8_t len)
 static uint8_t
 ao_radio_int_pin(void)
 {
 static uint8_t
 ao_radio_int_pin(void)
 {

-       return ao_gpio_get(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN, AO_CC1200_INT);
+       return ao_gpio_get(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN);

 }
 
 static uint8_t
 }
 
 static uint8_t

diff --git a/src/drivers/ao_companion.c b/src/drivers/ao_companion.c
index 3967090b55d04fa37c1ae5c87a0dc7cfe8c8c955..44868fb646e48faa232ff9192c162c6d3deb06ce 100644 (file)
--- a/src/drivers/ao_companion.c
+++ b/src/drivers/ao_companion.c
@@ -31,7 +31,6 @@
 #define COMPANION_SELECT()     do {                    \
                ao_spi_get_bit(AO_COMPANION_CS_PORT,    \
                               AO_COMPANION_CS_PIN,     \
 #define COMPANION_SELECT()     do {                    \
                ao_spi_get_bit(AO_COMPANION_CS_PORT,    \
                               AO_COMPANION_CS_PIN,     \

-                              AO_COMPANION_CS,         \

                               AO_COMPANION_SPI_BUS,    \
                               AO_SPI_SPEED_200kHz);    \
        } while (0)
                               AO_COMPANION_SPI_BUS,    \
                               AO_SPI_SPEED_200kHz);    \
        } while (0)


@@ -39,7 +38,6 @@
 #define COMPANION_DESELECT()   do {                    \
                ao_spi_put_bit(AO_COMPANION_CS_PORT,    \
                               AO_COMPANION_CS_PIN,     \
 #define COMPANION_DESELECT()   do {                    \
                ao_spi_put_bit(AO_COMPANION_CS_PORT,    \
                               AO_COMPANION_CS_PIN,     \

-                              AO_COMPANION_CS,         \

                               AO_COMPANION_SPI_BUS);   \
        } while (0)
 
                               AO_COMPANION_SPI_BUS);   \
        } while (0)
 


@@ -144,7 +142,7 @@ static struct ao_task ao_companion_task;
 void
 ao_companion_init(void)
 {
 void
 ao_companion_init(void)
 {

-       ao_enable_output(AO_COMPANION_CS_PORT, AO_COMPANION_CS_PIN, AO_COMPANION_CS, 1);
+       ao_enable_output(AO_COMPANION_CS_PORT, AO_COMPANION_CS_PIN, 1);

        ao_cmd_register(&ao_companion_cmds[0]);
        ao_add_task(&ao_companion_task, ao_companion, "companion");
 }
        ao_cmd_register(&ao_companion_cmds[0]);
        ao_add_task(&ao_companion_task, ao_companion, "companion");
 }

diff --git a/src/drivers/ao_mma655x.c b/src/drivers/ao_mma655x.c
index a48c1db20cec31606910d5446d69e30ad7c3eb36..e8eeea6e4b6dc8d424a9bf242ab60b706fbe399e 100644 (file)
--- a/src/drivers/ao_mma655x.c
+++ b/src/drivers/ao_mma655x.c
@@ -34,7 +34,6 @@ static void
 ao_mma655x_start(void) {
        ao_spi_get_bit(AO_MMA655X_CS_PORT,
                       AO_MMA655X_CS_PIN,
 ao_mma655x_start(void) {
        ao_spi_get_bit(AO_MMA655X_CS_PORT,
                       AO_MMA655X_CS_PIN,

-                      AO_MMA655X_CS,

                       AO_MMA655X_SPI_INDEX,
                       AO_SPI_SPEED_FAST);
 }
                       AO_MMA655X_SPI_INDEX,
                       AO_SPI_SPEED_FAST);
 }


@@ -43,19 +42,18 @@ static void
 ao_mma655x_stop(void) {
        ao_spi_put_bit(AO_MMA655X_CS_PORT,
                       AO_MMA655X_CS_PIN,
 ao_mma655x_stop(void) {
        ao_spi_put_bit(AO_MMA655X_CS_PORT,
                       AO_MMA655X_CS_PIN,

-                      AO_MMA655X_CS,

                       AO_MMA655X_SPI_INDEX);
 }
 
 static void
 ao_mma655x_restart(void) {
        uint8_t i;
                       AO_MMA655X_SPI_INDEX);
 }
 
 static void
 ao_mma655x_restart(void) {
        uint8_t i;

-       ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, AO_MMA655X_CS, 1);
+       ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, 1);

 
        /* Emperical testing on STM32L151 at 32MHz for this delay amount */
        for (i = 0; i < 10; i++)
                ao_arch_nop();
 
        /* Emperical testing on STM32L151 at 32MHz for this delay amount */
        for (i = 0; i < 10; i++)
                ao_arch_nop();

-       ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, AO_MMA655X_CS, 0);
+       ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, 0);

 }
 
 static uint8_t
 }
 
 static uint8_t

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index a468fee3392bd23b8d8211e6de898ad4ce0296dd..a00d54c8e04c35f82e71f8cc4edb1a05537c1356 100644 (file)
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -31,12 +31,12 @@ static uint8_t              ms5607_configured;
 
 static void
 ao_ms5607_start(void) {
 
 static void
 ao_ms5607_start(void) {

-       ao_spi_get_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_CS, AO_MS5607_SPI_INDEX, AO_MS5607_SPI_SPEED);
+       ao_spi_get_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_SPI_INDEX, AO_MS5607_SPI_SPEED);

 }
 
 static void
 ao_ms5607_stop(void) {
 }
 
 static void
 ao_ms5607_stop(void) {

-       ao_spi_put_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_CS, AO_MS5607_SPI_INDEX);
+       ao_spi_put_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_SPI_INDEX);

 }
 
 static void
 }
 
 static void


@@ -164,7 +164,7 @@ ao_ms5607_get_sample(uint8_t cmd) {
        ao_spi_put(AO_MS5607_SPI_INDEX);
 #endif
        ao_arch_block_interrupts();
        ao_spi_put(AO_MS5607_SPI_INDEX);
 #endif
        ao_arch_block_interrupts();

-       while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN, AO_MS5607_MISO) &&
+       while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN) &&

               !ao_ms5607_done)
                ao_sleep((void *) &ao_ms5607_done);
        ao_arch_release_interrupts();
               !ao_ms5607_done)
                ao_sleep((void *) &ao_ms5607_done);
        ao_arch_release_interrupts();

diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index c08798ac795db6da1555e3a164d09b443397a14e..85691f5c933474efa5fd73958b242a875d685f70 100644 (file)
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -50,7 +50,7 @@ static void
 ao_siren(uint8_t v)
 {
 #ifdef AO_SIREN
 ao_siren(uint8_t v)
 {
 #ifdef AO_SIREN

-       ao_gpio_set(AO_SIREN_PORT, AO_SIREN_PIN, AO_SIREN, v);
+       ao_gpio_set(AO_SIREN_PORT, AO_SIREN_PIN, v);

 #else
 #if HAS_BEEP
        ao_beep(v ? AO_BEEP_MID : 0);
 #else
 #if HAS_BEEP
        ao_beep(v ? AO_BEEP_MID : 0);


@@ -64,7 +64,7 @@ static void
 ao_strobe(uint8_t v)
 {
 #ifdef AO_STROBE
 ao_strobe(uint8_t v)
 {
 #ifdef AO_STROBE

-       ao_gpio_set(AO_STROBE_PORT, AO_STROBE_PIN, AO_STROBE, v);
+       ao_gpio_set(AO_STROBE_PORT, AO_STROBE_PIN, v);

 #else
        (void) v;
 #endif
 #else
        (void) v;
 #endif


@@ -589,34 +589,34 @@ ao_pad_init(void)
        }
 #endif
 #if AO_PAD_NUM > 0
        }
 #endif
 #if AO_PAD_NUM > 0

-       ao_enable_output(AO_PAD_0_PORT, AO_PAD_PIN_0, AO_PAD_0, 0);
+       ao_enable_output(AO_PAD_0_PORT, AO_PAD_PIN_0, 0);

 #endif
 #if AO_PAD_NUM > 1
 #endif
 #if AO_PAD_NUM > 1

-       ao_enable_output(AO_PAD_1_PORT, AO_PAD_PIN_1, AO_PAD_1, 0);
+       ao_enable_output(AO_PAD_1_PORT, AO_PAD_PIN_1, 0);

 #endif
 #if AO_PAD_NUM > 2
 #endif
 #if AO_PAD_NUM > 2

-       ao_enable_output(AO_PAD_2_PORT, AO_PAD_PIN_2, AO_PAD_2, 0);
+       ao_enable_output(AO_PAD_2_PORT, AO_PAD_PIN_2, 0);

 #endif
 #if AO_PAD_NUM > 3
 #endif
 #if AO_PAD_NUM > 3

-       ao_enable_output(AO_PAD_3_PORT, AO_PAD_PIN_3, AO_PAD_3, 0);
+       ao_enable_output(AO_PAD_3_PORT, AO_PAD_PIN_3, 0);

 #endif
 #if AO_PAD_NUM > 4
 #endif
 #if AO_PAD_NUM > 4

-       ao_enable_output(AO_PAD_4_PORT, AO_PAD_PIN_4, AO_PAD_4, 0);
+       ao_enable_output(AO_PAD_4_PORT, AO_PAD_PIN_4, 0);

 #endif
 #if AO_PAD_NUM > 5
 #endif
 #if AO_PAD_NUM > 5

-       ao_enable_output(AO_PAD_5_PORT, AO_PAD_PIN_5, AO_PAD_5, 0);
+       ao_enable_output(AO_PAD_5_PORT, AO_PAD_PIN_5, 0);

 #endif
 #if AO_PAD_NUM > 5
 #endif
 #if AO_PAD_NUM > 5

-       ao_enable_output(AO_PAD_6_PORT, AO_PAD_PIN_6, AO_PAD_6, 0);
+       ao_enable_output(AO_PAD_6_PORT, AO_PAD_PIN_6, 0);

 #endif
 #if AO_PAD_NUM > 7
 #endif
 #if AO_PAD_NUM > 7

-       ao_enable_output(AO_PAD_7_PORT, AO_PAD_PIN_7, AO_PAD_7, 0);
+       ao_enable_output(AO_PAD_7_PORT, AO_PAD_PIN_7, 0);

 #endif
 #ifdef AO_STROBE
 #endif
 #ifdef AO_STROBE

-       ao_enable_output(AO_STROBE_PORT, AO_STROBE_PIN, AO_STROBE, 0);
+       ao_enable_output(AO_STROBE_PORT, AO_STROBE_PIN, 0);

 #endif
 #ifdef AO_SIREN
 #endif
 #ifdef AO_SIREN

-       ao_enable_output(AO_SIREN_PORT, AO_SIREN_PIN, AO_SIREN, 0);
+       ao_enable_output(AO_SIREN_PORT, AO_SIREN_PIN, 0);

 #endif
        ao_cmd_register(&ao_pad_cmds[0]);
        ao_add_task(&ao_pad_task, ao_pad, "pad listener");
 #endif
        ao_cmd_register(&ao_pad_cmds[0]);
        ao_add_task(&ao_pad_task, ao_pad, "pad listener");

diff --git a/src/drivers/ao_ps2.c b/src/drivers/ao_ps2.c
index 29eecea871b3f2a50ad56a1a5958304ce29c13bb..c7520b3a95938935ca87e60188d9b5a9d191de1c 100644 (file)
--- a/src/drivers/ao_ps2.c
+++ b/src/drivers/ao_ps2.c
@@ -91,11 +91,11 @@ ao_ps2_put(uint8_t c)
        ao_arch_release_interrupts();
 
        /* pull the clock pin down */
        ao_arch_release_interrupts();
 
        /* pull the clock pin down */

-       ao_enable_output(AO_PS2_CLOCK_PORT, AO_PS2_CLOCK_BIT, AO_PS2_CLOCK_PIN, 0);
+       ao_enable_output(AO_PS2_CLOCK_PORT, AO_PS2_CLOCK_BIT, 0);

        ao_delay(0);
 
        /* pull the data pin down for the start bit */
        ao_delay(0);
 
        /* pull the data pin down for the start bit */

-       ao_enable_output(AO_PS2_DATA_PORT, AO_PS2_DATA_BIT, AO_PS2_DATA_PIN, 0);
+       ao_enable_output(AO_PS2_DATA_PORT, AO_PS2_DATA_BIT, 0);

        ao_delay(0);
 
        /* switch back to input mode for the interrupt to work */
        ao_delay(0);
 
        /* switch back to input mode for the interrupt to work */


@@ -369,7 +369,7 @@ ao_ps2_isr(void)
        uint8_t bit;
 
        if (ao_ps2_tx_count) {
        uint8_t bit;
 
        if (ao_ps2_tx_count) {

-               ao_gpio_set(AO_PS2_DATA_PORT, AO_PS2_DATA_BIT, AO_PS2_DATA_PIN, ao_ps2_tx&1);
+               ao_gpio_set(AO_PS2_DATA_PORT, AO_PS2_DATA_BIT, ao_ps2_tx&1);

                ao_ps2_tx >>= 1;
                ao_ps2_tx_count--;
                if (!ao_ps2_tx_count) {
                ao_ps2_tx >>= 1;
                ao_ps2_tx_count--;
                if (!ao_ps2_tx_count) {


@@ -383,7 +383,7 @@ ao_ps2_isr(void)
                ao_ps2_count = 0;
        ao_ps2_tick = ao_tick_count;
 
                ao_ps2_count = 0;
        ao_ps2_tick = ao_tick_count;
 

-       bit = ao_gpio_get(AO_PS2_DATA_PORT, AO_PS2_DATA_BIT, AO_PS2_DATA_PIN);
+       bit = ao_gpio_get(AO_PS2_DATA_PORT, AO_PS2_DATA_BIT);

        if (ao_ps2_count == 0) {
                /* check for start bit, ignore if not zero */
                if (bit)
        if (ao_ps2_count == 0) {
                /* check for start bit, ignore if not zero */
                if (bit)

diff --git a/src/drivers/ao_rn4678.c b/src/drivers/ao_rn4678.c
index 98dc35b55eee33c8b7cd8ba069912423eaf23674..4ace4b78595c1a4a00743675fbe459cf670b6aa9 100644 (file)
--- a/src/drivers/ao_rn4678.c
+++ b/src/drivers/ao_rn4678.c
@@ -335,7 +335,7 @@ ao_rn_get_name(char *name, int len)
 static void
 ao_rn_check_link(void)
 {
 static void
 ao_rn_check_link(void)
 {

-       ao_rn_connected = 1 - ao_gpio_get(AO_RN_CONNECTED_PORT, AO_RN_CONNECTED_PIN, foo);
+       ao_rn_connected = 1 - ao_gpio_get(AO_RN_CONNECTED_PORT, AO_RN_CONNECTED_PIN);

 }
 
 static void
 }
 
 static void


@@ -384,17 +384,17 @@ ao_rn(void)
        ao_rn_dbg("ao_rn top\n");
 
        /* Select CMD mode after the device gets out of reset */
        ao_rn_dbg("ao_rn top\n");
 
        /* Select CMD mode after the device gets out of reset */

-       ao_gpio_set(AO_RN_CMD_PORT, AO_RN_CMD_PIN, foo, AO_RN_CMD_CMD);
+       ao_gpio_set(AO_RN_CMD_PORT, AO_RN_CMD_PIN, AO_RN_CMD_CMD);

 
        for (i = 0; i < 3; i++) {
                ao_rn_dbg("reset device\n");
 
 
        for (i = 0; i < 3; i++) {
                ao_rn_dbg("reset device\n");
 

-               ao_gpio_set(AO_RN_RST_N_PORT, AO_RN_RST_N_PIN, foo, 0);
+               ao_gpio_set(AO_RN_RST_N_PORT, AO_RN_RST_N_PIN, 0);

                ao_delay(AO_MS_TO_TICKS(100));
 
                /* Reboot the RN4678 and wait for it to start talking */
                ao_rn_drain();
                ao_delay(AO_MS_TO_TICKS(100));
 
                /* Reboot the RN4678 and wait for it to start talking */
                ao_rn_drain();

-               ao_gpio_set(AO_RN_RST_N_PORT, AO_RN_RST_N_PIN, foo, 1);
+               ao_gpio_set(AO_RN_RST_N_PORT, AO_RN_RST_N_PIN, 1);

                status = ao_rn_wait_for(AO_RN_REBOOT_TIMEOUT, AO_RN_REBOOT_MSG);
                if (status != AO_RN_OK) {
                        ao_rn_dbg("reboot failed\n");
                status = ao_rn_wait_for(AO_RN_REBOOT_TIMEOUT, AO_RN_REBOOT_MSG);
                if (status != AO_RN_OK) {
                        ao_rn_dbg("reboot failed\n");


@@ -468,7 +468,7 @@ ao_rn(void)
        if (status != AO_RN_OK)
                ao_bt_panic(4);
 
        if (status != AO_RN_OK)
                ao_bt_panic(4);
 

-       ao_gpio_set(AO_RN_CMD_PORT, AO_RN_CMD_PIN, foo, AO_RN_CMD_DATA);
+       ao_gpio_set(AO_RN_CMD_PORT, AO_RN_CMD_PIN, AO_RN_CMD_DATA);

 
        /* Wait for the hardware to finish sending messages, then clear the queue */
        ao_delay(AO_MS_TO_TICKS(200));
 
        /* Wait for the hardware to finish sending messages, then clear the queue */
        ao_delay(AO_MS_TO_TICKS(200));


@@ -530,16 +530,16 @@ ao_rn_factory(void)
         */
 
        /* Select our target output pin */
         */
 
        /* Select our target output pin */

-       ao_enable_output(AO_RN_P3_1_PORT, AO_RN_P3_1_PIN, foo, v);
+       ao_enable_output(AO_RN_P3_1_PORT, AO_RN_P3_1_PIN, v);

 
        /* Turn off the BT device using the SW_BTN pin */
        printf("Power down BT\n"); flush();
 
        /* Turn off the BT device using the SW_BTN pin */
        printf("Power down BT\n"); flush();

-       ao_gpio_set(AO_RN_SW_BTN_PORT, AO_RN_SW_BTN_PIN, foo, 0);
+       ao_gpio_set(AO_RN_SW_BTN_PORT, AO_RN_SW_BTN_PIN, 0);

        ao_delay(AO_MS_TO_TICKS(1000));
 
        /* And turn it back on */
        printf("Power up BT\n"); flush();
        ao_delay(AO_MS_TO_TICKS(1000));
 
        /* And turn it back on */
        printf("Power up BT\n"); flush();

-       ao_gpio_set(AO_RN_SW_BTN_PORT, AO_RN_SW_BTN_PIN, foo, 1);
+       ao_gpio_set(AO_RN_SW_BTN_PORT, AO_RN_SW_BTN_PIN, 1);

 
        /* Right after power on, poke P3_1 five times to force a
         * factory reset
 
        /* Right after power on, poke P3_1 five times to force a
         * factory reset


@@ -547,7 +547,7 @@ ao_rn_factory(void)
        for (i = 0; i < 20; i++) {
                v = 1-v;
                ao_delay(AO_MS_TO_TICKS(50));
        for (i = 0; i < 20; i++) {
                v = 1-v;
                ao_delay(AO_MS_TO_TICKS(50));

-               ao_gpio_set(AO_RN_P3_1_PORT, AO_RN_P3_1_PIN, foo, v);
+               ao_gpio_set(AO_RN_P3_1_PORT, AO_RN_P3_1_PIN, v);

                ao_led_toggle(AO_BT_LED);
        }
 
                ao_led_toggle(AO_BT_LED);
        }
 


@@ -556,9 +556,9 @@ ao_rn_factory(void)
 
        printf("Reboot BT\n"); flush();
        ao_delay(AO_MS_TO_TICKS(100));
 
        printf("Reboot BT\n"); flush();
        ao_delay(AO_MS_TO_TICKS(100));

-       ao_gpio_set(AO_RN_RST_N_PORT, AO_RN_RST_N_PIN, foo, 0);
+       ao_gpio_set(AO_RN_RST_N_PORT, AO_RN_RST_N_PIN, 0);

        ao_delay(AO_MS_TO_TICKS(100));
        ao_delay(AO_MS_TO_TICKS(100));

-       ao_gpio_set(AO_RN_RST_N_PORT, AO_RN_RST_N_PIN, foo, 1);
+       ao_gpio_set(AO_RN_RST_N_PORT, AO_RN_RST_N_PIN, 1);

 }
 
 #if AO_RN_DEBUG
 }
 
 #if AO_RN_DEBUG


@@ -588,13 +588,13 @@ ao_rn4678_init(void)
        ao_serial_rn_set_speed(AO_SERIAL_SPEED_115200);
 
        /* Reset line */
        ao_serial_rn_set_speed(AO_SERIAL_SPEED_115200);
 
        /* Reset line */

-       ao_enable_output(AO_RN_RST_N_PORT, AO_RN_RST_N_PIN, foo, 0);
+       ao_enable_output(AO_RN_RST_N_PORT, AO_RN_RST_N_PIN, 0);

 
        /* SW_BTN */
 
        /* SW_BTN */

-       ao_enable_output(AO_RN_SW_BTN_PORT, AO_RN_SW_BTN_PIN, foo, 1);
+       ao_enable_output(AO_RN_SW_BTN_PORT, AO_RN_SW_BTN_PIN, 1);

 
        /* P3_7 command/data selector */
 
        /* P3_7 command/data selector */

-       ao_enable_output(AO_RN_CMD_PORT, AO_RN_CMD_PIN, foo, AO_RN_CMD_CMD);
+       ao_enable_output(AO_RN_CMD_PORT, AO_RN_CMD_PIN, AO_RN_CMD_CMD);

 
        ao_enable_input(AO_RN_CONNECTED_PORT, AO_RN_CONNECTED_PIN, AO_EXTI_MODE_PULL_NONE);
        ao_exti_setup(AO_RN_CONNECTED_PORT, AO_RN_CONNECTED_PIN,
 
        ao_enable_input(AO_RN_CONNECTED_PORT, AO_RN_CONNECTED_PIN, AO_EXTI_MODE_PULL_NONE);
        ao_exti_setup(AO_RN_CONNECTED_PORT, AO_RN_CONNECTED_PIN,

diff --git a/src/drivers/ao_sdcard.c b/src/drivers/ao_sdcard.c
index 45454000f663c6c662af747fa71cfab83d465835..9d36c397552277a2baab9f0fbdd0b00d8824a997 100644 (file)
--- a/src/drivers/ao_sdcard.c
+++ b/src/drivers/ao_sdcard.c
@@ -34,8 +34,8 @@ extern uint8_t ao_radio_mutex;
 #define ao_sdcard_send_fixed(d,l)      ao_spi_send_fixed((d), (l), AO_SDCARD_SPI_BUS)
 #define ao_sdcard_send(d,l)            ao_spi_send((d), (l), AO_SDCARD_SPI_BUS)
 #define ao_sdcard_recv(d,l)            ao_spi_recv((d), (l), AO_SDCARD_SPI_BUS)
 #define ao_sdcard_send_fixed(d,l)      ao_spi_send_fixed((d), (l), AO_SDCARD_SPI_BUS)
 #define ao_sdcard_send(d,l)            ao_spi_send((d), (l), AO_SDCARD_SPI_BUS)
 #define ao_sdcard_recv(d,l)            ao_spi_recv((d), (l), AO_SDCARD_SPI_BUS)

-#define ao_sdcard_select()             ao_gpio_set(AO_SDCARD_SPI_CS_PORT,AO_SDCARD_SPI_CS_PIN,AO_SDCARD_SPI_CS,0)
-#define ao_sdcard_deselect()           ao_gpio_set(AO_SDCARD_SPI_CS_PORT,AO_SDCARD_SPI_CS_PIN,AO_SDCARD_SPI_CS,1)
+#define ao_sdcard_select()             ao_gpio_set(AO_SDCARD_SPI_CS_PORT,AO_SDCARD_SPI_CS_PIN,0)
+#define ao_sdcard_deselect()           ao_gpio_set(AO_SDCARD_SPI_CS_PORT,AO_SDCARD_SPI_CS_PIN,1)

 
 /* Include SD card commands */
 #ifndef SDCARD_DEBUG
 
 /* Include SD card commands */
 #ifndef SDCARD_DEBUG

diff --git a/src/drivers/ao_trng_send.c b/src/drivers/ao_trng_send.c
index e8df4cea8e69f25861a73a81acfedcc5f372dfad..adeed59028f5991e1d08e62c319affbc6e790ffc 100644 (file)
--- a/src/drivers/ao_trng_send.c
+++ b/src/drivers/ao_trng_send.c
@@ -140,7 +140,7 @@ ao_trng_send(void)
        usb_buf_id = ao_usb_alloc(buffer);
 
 #ifdef AO_TRNG_ENABLE_PORT
        usb_buf_id = ao_usb_alloc(buffer);
 
 #ifdef AO_TRNG_ENABLE_PORT

-       ao_gpio_set(AO_TRNG_ENABLE_PORT, AO_TRNG_ENABLE_BIT, AO_TRNG_ENABLE_PIN, 1);
+       ao_gpio_set(AO_TRNG_ENABLE_PORT, AO_TRNG_ENABLE_BIT, 1);

 #endif
        trng_power_time = ao_time();
 
 #endif
        trng_power_time = ao_time();
 


@@ -211,7 +211,7 @@ static void ao_trng_suspend(void *arg)
 {
        (void) arg;
 #ifdef AO_TRNG_ENABLE_PORT
 {
        (void) arg;
 #ifdef AO_TRNG_ENABLE_PORT

-       ao_gpio_set(AO_TRNG_ENABLE_PORT, AO_TRNG_ENABLE_BIT, AO_TRNG_ENABLE_PIN, 0);
+       ao_gpio_set(AO_TRNG_ENABLE_PORT, AO_TRNG_ENABLE_BIT, 0);

 #endif
        trng_running = false;
 }
 #endif
        trng_running = false;
 }


@@ -220,7 +220,7 @@ static void ao_trng_resume(void *arg)
 {
        (void) arg;
 #ifdef AO_TRNG_ENABLE_PORT
 {
        (void) arg;
 #ifdef AO_TRNG_ENABLE_PORT

-       ao_gpio_set(AO_TRNG_ENABLE_PORT, AO_TRNG_ENABLE_BIT, AO_TRNG_ENABLE_PIN, 1);
+       ao_gpio_set(AO_TRNG_ENABLE_PORT, AO_TRNG_ENABLE_BIT, 1);

 #endif
        trng_power_time = ao_time();
 }
 #endif
        trng_power_time = ao_time();
 }


@@ -236,7 +236,7 @@ void
 ao_trng_send_init(void)
 {
 #ifdef AO_TRNG_ENABLE_PORT
 ao_trng_send_init(void)
 {
 #ifdef AO_TRNG_ENABLE_PORT

-       ao_enable_output(AO_TRNG_ENABLE_PORT, AO_TRNG_ENABLE_BIT, AO_TRNG_ENABLE_PIN, 0);
+       ao_enable_output(AO_TRNG_ENABLE_PORT, AO_TRNG_ENABLE_BIT, 0);

        ao_power_register(&ao_trng_power);
 #endif
        ao_enable_input(AO_RAW_PORT, AO_RAW_BIT, AO_EXTI_MODE_PULL_UP);
        ao_power_register(&ao_trng_power);
 #endif
        ao_enable_input(AO_RAW_PORT, AO_RAW_BIT, AO_EXTI_MODE_PULL_UP);

diff --git a/src/drivers/ao_watchdog.c b/src/drivers/ao_watchdog.c
index 4d774c3ae2d5bbdda3ecb6dc07c1da53d0482f32..612496bcd6a1a371b00cde5abfdfb65b567f1d9e 100644 (file)
--- a/src/drivers/ao_watchdog.c
+++ b/src/drivers/ao_watchdog.c
@@ -28,9 +28,9 @@ ao_watchdog(void)
                        ao_sleep(&ao_watchdog_enabled);
                while (ao_watchdog_enabled) {
                        ao_delay(AO_WATCHDOG_INTERVAL);
                        ao_sleep(&ao_watchdog_enabled);
                while (ao_watchdog_enabled) {
                        ao_delay(AO_WATCHDOG_INTERVAL);

-                       ao_gpio_set(AO_WATCHDOG_PORT, AO_WATCHDOG_BIT, AO_WATCHDOG_PIN, 1);
+                       ao_gpio_set(AO_WATCHDOG_PORT, AO_WATCHDOG_BIT, 1);

                        ao_delay(1);
                        ao_delay(1);

-                       ao_gpio_set(AO_WATCHDOG_PORT, AO_WATCHDOG_BIT, AO_WATCHDOG_PIN, 0);
+                       ao_gpio_set(AO_WATCHDOG_PORT, AO_WATCHDOG_BIT, 0);

                }
        }
 }
                }
        }
 }


@@ -56,7 +56,7 @@ static struct ao_task watchdog_task;
 void
 ao_watchdog_init(void)
 {
 void
 ao_watchdog_init(void)
 {

-       ao_enable_output(AO_WATCHDOG_PORT, AO_WATCHDOG_BIT, AO_WATCHDOG, 0);
+       ao_enable_output(AO_WATCHDOG_PORT, AO_WATCHDOG_BIT, 0);

        ao_cmd_register(&ao_watchdog_cmds[0]);
        ao_add_task(&watchdog_task, ao_watchdog, "watchdog");
 }
        ao_cmd_register(&ao_watchdog_cmds[0]);
        ao_add_task(&watchdog_task, ao_watchdog, "watchdog");
 }

diff --git a/src/easymega-v1.0/ao_pins.h b/src/easymega-v1.0/ao_pins.h
index b80164786ba1f88b61f8d6df17b1f2e7da03bde6..e7382e4bed21a34e8d37f9d75c7410181b55e6f2 100644 (file)
--- a/src/easymega-v1.0/ao_pins.h
+++ b/src/easymega-v1.0/ao_pins.h
@@ -165,9 +165,6 @@
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 

-#define AO_IGNITER_SET_DROGUE(v)       stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
-#define AO_IGNITER_SET_MAIN(v)         stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
-

 /*
  * ADC
  */
 /*
  * ADC
  */

diff --git a/src/easymini-v1.0/ao_pins.h b/src/easymini-v1.0/ao_pins.h
index 45c6891d8ad790c8b8b3c32090f89cf38db0033f..201b913edd1e981532b7513d0f8eb72ec24e26c8 100644 (file)
--- a/src/easymini-v1.0/ao_pins.h
+++ b/src/easymini-v1.0/ao_pins.h
@@ -123,11 +123,9 @@ struct ao_adc {
 
 #define AO_IGNITER_DROGUE_PORT 0
 #define AO_IGNITER_DROGUE_PIN  2
 
 #define AO_IGNITER_DROGUE_PORT 0
 #define AO_IGNITER_DROGUE_PIN  2

-#define AO_IGNITER_SET_DROGUE(v)       ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)

 
 #define AO_IGNITER_MAIN_PORT   0
 #define AO_IGNITER_MAIN_PIN    3
 
 #define AO_IGNITER_MAIN_PORT   0
 #define AO_IGNITER_MAIN_PIN    3

-#define AO_IGNITER_SET_MAIN(v)         ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, v)

 
 #define AO_SENSE_DROGUE(p)     ((p)->adc.sense_a)
 #define AO_SENSE_MAIN(p)       ((p)->adc.sense_m)
 
 #define AO_SENSE_DROGUE(p)     ((p)->adc.sense_a)
 #define AO_SENSE_MAIN(p)       ((p)->adc.sense_m)

diff --git a/src/easymini-v2.0/ao_pins.h b/src/easymini-v2.0/ao_pins.h
index 47eb577e1be8f58e892937dfc0827ae16aff507b..38d463100d3fd14d767bd7caf81bce52be7e31f7 100644 (file)
--- a/src/easymini-v2.0/ao_pins.h
+++ b/src/easymini-v2.0/ao_pins.h
@@ -132,11 +132,9 @@ struct ao_adc {
 
 #define AO_IGNITER_DROGUE_PORT (&stm_gpioa)
 #define AO_IGNITER_DROGUE_PIN  3
 
 #define AO_IGNITER_DROGUE_PORT (&stm_gpioa)
 #define AO_IGNITER_DROGUE_PIN  3

-#define AO_IGNITER_SET_DROGUE(v)       ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)

 
 #define AO_IGNITER_MAIN_PORT   (&stm_gpiob)
 #define AO_IGNITER_MAIN_PIN    7
 
 #define AO_IGNITER_MAIN_PORT   (&stm_gpiob)
 #define AO_IGNITER_MAIN_PIN    7

-#define AO_IGNITER_SET_MAIN(v) ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, v)

 
 #define AO_SENSE_DROGUE(p)     ((p)->adc.sense_a)
 #define AO_SENSE_MAIN(p)       ((p)->adc.sense_m)
 
 #define AO_SENSE_DROGUE(p)     ((p)->adc.sense_a)
 #define AO_SENSE_MAIN(p)       ((p)->adc.sense_m)

diff --git a/src/kernel/ao_ignite.c b/src/kernel/ao_ignite.c
index 5f41c552edec554e2d03aa529f068ea7c7282711..a6ff997984e7e6cc20617ac753ef42c431eb7eba 100644 (file)
--- a/src/kernel/ao_ignite.c
+++ b/src/kernel/ao_ignite.c
@@ -72,10 +72,8 @@ ao_igniter_status(enum ao_igniter igniter)
                return ao_igniter_unknown;
 }
 
                return ao_igniter_unknown;
 }
 

-#ifndef AO_IGNITER_SET_DROGUE
-#define AO_IGNITER_SET_DROGUE(v)       AO_IGNITER_DROGUE = (v)
-#define AO_IGNITER_SET_MAIN(v)         AO_IGNITER_MAIN = (v)
-#endif
+#define AO_IGNITER_SET_DROGUE(v)       ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
+#define AO_IGNITER_SET_MAIN(v)         ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)

 
 #ifndef AO_IGNITER_FIRE_TIME
 #define AO_IGNITER_FIRE_TIME           AO_MS_TO_TICKS(50)
 
 #ifndef AO_IGNITER_FIRE_TIME
 #define AO_IGNITER_FIRE_TIME           AO_MS_TO_TICKS(50)


@@ -226,8 +224,8 @@ struct ao_task ao_igniter_task;
 void
 ao_ignite_set_pins(void)
 {
 void
 ao_ignite_set_pins(void)
 {

-       ao_enable_output(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, 0);
-       ao_enable_output(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, 0);
+       ao_enable_output(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, 0);
+       ao_enable_output(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, 0);

 }
 #endif
 
 }
 #endif
 

diff --git a/src/kernel/ao_pyro.c b/src/kernel/ao_pyro.c
index c01c951216c8db71d0d05025b4e4664174392abe..30d1518f051701146b8e96a95a74d7715a685ee5 100644 (file)
--- a/src/kernel/ao_pyro.c
+++ b/src/kernel/ao_pyro.c
@@ -216,28 +216,28 @@ ao_pyro_pin_set(uint8_t p, uint8_t v)
 {
        switch (p) {
 #if AO_PYRO_NUM > 0
 {
        switch (p) {
 #if AO_PYRO_NUM > 0

-       case 0: ao_gpio_set(AO_PYRO_PORT_0, AO_PYRO_PIN_0, AO_PYRO_0, v); break;
+       case 0: ao_gpio_set(AO_PYRO_PORT_0, AO_PYRO_PIN_0, v); break;

 #endif
 #if AO_PYRO_NUM > 1
 #endif
 #if AO_PYRO_NUM > 1

-       case 1: ao_gpio_set(AO_PYRO_PORT_1, AO_PYRO_PIN_1, AO_PYRO_1, v); break;
+       case 1: ao_gpio_set(AO_PYRO_PORT_1, AO_PYRO_PIN_1, v); break;

 #endif
 #if AO_PYRO_NUM > 2
 #endif
 #if AO_PYRO_NUM > 2

-       case 2: ao_gpio_set(AO_PYRO_PORT_2, AO_PYRO_PIN_2, AO_PYRO_2, v); break;
+       case 2: ao_gpio_set(AO_PYRO_PORT_2, AO_PYRO_PIN_2, v); break;

 #endif
 #if AO_PYRO_NUM > 3
 #endif
 #if AO_PYRO_NUM > 3

-       case 3: ao_gpio_set(AO_PYRO_PORT_3, AO_PYRO_PIN_3, AO_PYRO_3, v); break;
+       case 3: ao_gpio_set(AO_PYRO_PORT_3, AO_PYRO_PIN_3, v); break;

 #endif
 #if AO_PYRO_NUM > 4
 #endif
 #if AO_PYRO_NUM > 4

-       case 4: ao_gpio_set(AO_PYRO_PORT_4, AO_PYRO_PIN_4, AO_PYRO_4, v); break;
+       case 4: ao_gpio_set(AO_PYRO_PORT_4, AO_PYRO_PIN_4, v); break;

 #endif
 #if AO_PYRO_NUM > 5
 #endif
 #if AO_PYRO_NUM > 5

-       case 5: ao_gpio_set(AO_PYRO_PORT_5, AO_PYRO_PIN_5, AO_PYRO_5, v); break;
+       case 5: ao_gpio_set(AO_PYRO_PORT_5, AO_PYRO_PIN_5, v); break;

 #endif
 #if AO_PYRO_NUM > 6
 #endif
 #if AO_PYRO_NUM > 6

-       case 6: ao_gpio_set(AO_PYRO_PORT_6, AO_PYRO_PIN_6, AO_PYRO_6, v); break;
+       case 6: ao_gpio_set(AO_PYRO_PORT_6, AO_PYRO_PIN_6, v); break;

 #endif
 #if AO_PYRO_NUM > 7
 #endif
 #if AO_PYRO_NUM > 7

-       case 7: ao_gpio_set(AO_PYRO_PORT_7, AO_PYRO_PIN_7, AO_PYRO_7, v); break;
+       case 7: ao_gpio_set(AO_PYRO_PORT_7, AO_PYRO_PIN_7, v); break;

 #endif
        default: break;
        }
 #endif
        default: break;
        }


@@ -555,28 +555,28 @@ void
 ao_pyro_init(void)
 {
 #if AO_PYRO_NUM > 0
 ao_pyro_init(void)
 {
 #if AO_PYRO_NUM > 0

-       ao_enable_output(AO_PYRO_PORT_0, AO_PYRO_PIN_0, AO_PYRO_0, 0);
+       ao_enable_output(AO_PYRO_PORT_0, AO_PYRO_PIN_0, 0);

 #endif
 #if AO_PYRO_NUM > 1
 #endif
 #if AO_PYRO_NUM > 1

-       ao_enable_output(AO_PYRO_PORT_1, AO_PYRO_PIN_1, AO_PYRO_1, 0);
+       ao_enable_output(AO_PYRO_PORT_1, AO_PYRO_PIN_1, 0);

 #endif
 #if AO_PYRO_NUM > 2
 #endif
 #if AO_PYRO_NUM > 2

-       ao_enable_output(AO_PYRO_PORT_2, AO_PYRO_PIN_2, AO_PYRO_2, 0);
+       ao_enable_output(AO_PYRO_PORT_2, AO_PYRO_PIN_2, 0);

 #endif
 #if AO_PYRO_NUM > 3
 #endif
 #if AO_PYRO_NUM > 3

-       ao_enable_output(AO_PYRO_PORT_3, AO_PYRO_PIN_3, AO_PYRO_3, 0);
+       ao_enable_output(AO_PYRO_PORT_3, AO_PYRO_PIN_3, 0);

 #endif
 #if AO_PYRO_NUM > 4
 #endif
 #if AO_PYRO_NUM > 4

-       ao_enable_output(AO_PYRO_PORT_4, AO_PYRO_PIN_4, AO_PYRO_4, 0);
+       ao_enable_output(AO_PYRO_PORT_4, AO_PYRO_PIN_4, 0);

 #endif
 #if AO_PYRO_NUM > 5
 #endif
 #if AO_PYRO_NUM > 5

-       ao_enable_output(AO_PYRO_PORT_5, AO_PYRO_PIN_5, AO_PYRO_5, 0);
+       ao_enable_output(AO_PYRO_PORT_5, AO_PYRO_PIN_5, 0);

 #endif
 #if AO_PYRO_NUM > 6
 #endif
 #if AO_PYRO_NUM > 6

-       ao_enable_output(AO_PYRO_PORT_6, AO_PYRO_PIN_6, AO_PYRO_6, 0);
+       ao_enable_output(AO_PYRO_PORT_6, AO_PYRO_PIN_6, 0);

 #endif
 #if AO_PYRO_NUM > 7
 #endif
 #if AO_PYRO_NUM > 7

-       ao_enable_output(AO_PYRO_PORT_7, AO_PYRO_PIN_7, AO_PYRO_7, 0);
+       ao_enable_output(AO_PYRO_PORT_7, AO_PYRO_PIN_7, 0);

 #endif
        ao_add_task(&ao_pyro_task, ao_pyro, "pyro");
 }
 #endif
        ao_add_task(&ao_pyro_task, ao_pyro, "pyro");
 }

diff --git a/src/kernel/ao_tracker.c b/src/kernel/ao_tracker.c
index f79bd18ae957d4e1d1516c6e1971a1a208e66be0..1454c17c31815aadd08c9d060f10a81cacf78711 100644 (file)
--- a/src/kernel/ao_tracker.c
+++ b/src/kernel/ao_tracker.c
@@ -30,7 +30,7 @@ static uint8_t                ao_tracker_force_telem;
 static inline uint8_t
 ao_usb_connected(void)
 {
 static inline uint8_t
 ao_usb_connected(void)
 {

-       return ao_gpio_get(AO_USB_CONNECT_PORT, AO_USB_CONNECT_PIN, AO_USB_CONNECT) != 0;
+       return ao_gpio_get(AO_USB_CONNECT_PORT, AO_USB_CONNECT_PIN) != 0;

 }
 #else
 #define ao_usb_connected()     1
 }
 #else
 #define ao_usb_connected()     1

diff --git a/src/lpc/ao_arch_funcs.h b/src/lpc/ao_arch_funcs.h
index 15106dea42d620b1bbc452c9e56b6eaea2c6bc36..0454b38b012e71f80d1dae78928dbe549579229e 100644 (file)
--- a/src/lpc/ao_arch_funcs.h
+++ b/src/lpc/ao_arch_funcs.h
@@ -19,17 +19,17 @@
 #ifndef _AO_ARCH_FUNCS_H_
 #define _AO_ARCH_FUNCS_H_
 
 #ifndef _AO_ARCH_FUNCS_H_
 #define _AO_ARCH_FUNCS_H_
 

-#define ao_spi_get_bit(reg,bit,pin,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
-#define ao_spi_put_bit(reg,bit,pin,bus) ao_spi_put_mask(reg,(1<<bit),bus)
+#define ao_spi_get_bit(reg,bit,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
+#define ao_spi_put_bit(reg,bit,bus) ao_spi_put_mask(reg,(1<<bit),bus)

 
 #define ao_enable_port(port) (lpc_scb.sysahbclkctrl |= (1 << LPC_SCB_SYSAHBCLKCTRL_GPIO))
 #define ao_disable_port(port) (lpc_scb.sysahbclkctrl &= ~(1 << LPC_SCB_SYSAHBCLKCTRL_GPIO))
 
 #define lpc_all_bit(port,bit)  (((port) << 5) | (bit))
 
 
 #define ao_enable_port(port) (lpc_scb.sysahbclkctrl |= (1 << LPC_SCB_SYSAHBCLKCTRL_GPIO))
 #define ao_disable_port(port) (lpc_scb.sysahbclkctrl &= ~(1 << LPC_SCB_SYSAHBCLKCTRL_GPIO))
 
 #define lpc_all_bit(port,bit)  (((port) << 5) | (bit))
 

-#define ao_gpio_set(port, bit, pin, v) (lpc_gpio.byte[lpc_all_bit(port,bit)] = (v))
+#define ao_gpio_set(port, bit, v)      (lpc_gpio.byte[lpc_all_bit(port,bit)] = (v))

 
 

-#define ao_gpio_get(port, bit, pin)    (lpc_gpio.byte[lpc_all_bit(port,bit)])
+#define ao_gpio_get(port, bit)         (lpc_gpio.byte[lpc_all_bit(port,bit)])

 
 #define PORT0_JTAG_REGS        ((1 << 11) | (1 << 12) | (1 << 14))
 
 
 #define PORT0_JTAG_REGS        ((1 << 11) | (1 << 12) | (1 << 14))
 


@@ -41,10 +41,10 @@ static inline void lpc_set_gpio(int port, int bit) {
        }
 }
 
        }
 }
 

-#define ao_enable_output(port,bit,pin,v) do {                  \
+#define ao_enable_output(port,bit,v) do {                      \

                ao_enable_port(port);                           \
                lpc_set_gpio(port,bit);                         \
                ao_enable_port(port);                           \
                lpc_set_gpio(port,bit);                         \

-               ao_gpio_set(port, bit, pin, v);                 \
+               ao_gpio_set(port, bit, v);                      \

                lpc_gpio.dir[port] |= (1 << bit);               \
        } while (0)
 
                lpc_gpio.dir[port] |= (1 << bit);               \
        } while (0)
 


@@ -204,8 +204,8 @@ static inline void ao_arch_restore_stack(void) {
                ao_spi_put(bus);                \
        } while (0)
 
                ao_spi_put(bus);                \
        } while (0)
 

-#define ao_spi_get_bit(reg,bit,pin,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
-#define ao_spi_put_bit(reg,bit,pin,bus) ao_spi_put_mask(reg,(1<<bit),bus)
+#define ao_spi_get_bit(reg,bit,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
+#define ao_spi_put_bit(reg,bit,bus) ao_spi_put_mask(reg,(1<<bit),bus)

 
 void
 ao_spi_get(uint8_t spi_index, uint32_t speed);
 
 void
 ao_spi_get(uint8_t spi_index, uint32_t speed);


@@ -254,7 +254,7 @@ static inline void ao_spi_send_byte(uint8_t byte, uint8_t spi_index)
                uint8_t __bit__;                                        \
                for (__bit__ = 0; __bit__ < 32; __bit__++) {            \
                        if (mask & (1 << __bit__))                      \
                uint8_t __bit__;                                        \
                for (__bit__ = 0; __bit__ < 32; __bit__++) {            \
                        if (mask & (1 << __bit__))                      \

-                               ao_enable_output(port, __bit__, PIN, 1); \
+                               ao_enable_output(port, __bit__, 1); \

                }                                                       \
        } while (0)
 
                }                                                       \
        } while (0)
 

diff --git a/src/lpc/ao_boot_pin.c b/src/lpc/ao_boot_pin.c
index e3c7d0c16d3d19e292fe8c1386f8af22c534e5d9..a51c7f8d45414d59eb9a47b47adeb54714ebefdd 100644 (file)
--- a/src/lpc/ao_boot_pin.c
+++ b/src/lpc/ao_boot_pin.c
@@ -36,7 +36,7 @@ ao_boot_check_pin(void)
                ao_arch_nop();
 
        /* Read the value */
                ao_arch_nop();
 
        /* Read the value */

-       v = ao_gpio_get(AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, AO_BOOT_APPLICATION);
+       v = ao_gpio_get(AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN);

 
        /* Reset the chip to turn off the port and the power interface clock */
        ao_gpio_set_mode(AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);
 
        /* Reset the chip to turn off the port and the power interface clock */
        ao_gpio_set_mode(AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);

diff --git a/src/lpc/ao_usb_lpc.c b/src/lpc/ao_usb_lpc.c
index 5cd7aa59fca66a9f3effcf4cd84d5158b35013b2..594114b62ed856a8b4babc8f9ccf47f3597d9624 100644 (file)
--- a/src/lpc/ao_usb_lpc.c
+++ b/src/lpc/ao_usb_lpc.c
@@ -857,7 +857,7 @@ ao_usb_disable(void)
        ao_arch_block_interrupts();
 
 #if HAS_USB_PULLUP
        ao_arch_block_interrupts();
 
 #if HAS_USB_PULLUP

-       ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+       ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, 0);

 #endif
        /* Disable interrupts */
        lpc_usb.inten = 0;
 #endif
        /* Disable interrupts */
        lpc_usb.inten = 0;


@@ -975,7 +975,7 @@ ao_usb_enable(void)
        ao_usb_set_ep0();
 
 #if HAS_USB_PULLUP
        ao_usb_set_ep0();
 
 #if HAS_USB_PULLUP

-       ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 1);
+       ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, 1);

 #endif
 }
 
 #endif
 }
 


@@ -1014,7 +1014,7 @@ ao_usb_init(void)
 {
 #if HAS_USB_PULLUP
        int     i;
 {
 #if HAS_USB_PULLUP
        int     i;

-       ao_enable_output(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+       ao_enable_output(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, 0);

 
        for (i = 0; i < 40000; i++)
                ao_arch_nop();
 
        for (i = 0; i < 40000; i++)
                ao_arch_nop();

diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
index 522059bc3d2193510e54d431d0bd9fd6e9bd45d5..9bb598f67fa3d68496c29f1a9ed2f8147957a149 100644 (file)
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -166,8 +166,8 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s
                ao_spi_put(bus);                \
        } while (0)
 
                ao_spi_put(bus);                \
        } while (0)
 

-#define ao_spi_get_bit(reg,bit,pin,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
-#define ao_spi_put_bit(reg,bit,pin,bus) ao_spi_put_mask(reg,(1<<bit),bus)
+#define ao_spi_get_bit(reg,bit,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
+#define ao_spi_put_bit(reg,bit,bus) ao_spi_put_mask(reg,(1<<bit),bus)

 
 #define ao_enable_port(port) do {                                      \
                if ((port) == &stm_gpioa)                               \
 
 #define ao_enable_port(port) do {                                      \
                if ((port) == &stm_gpioa)                               \


@@ -196,9 +196,9 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s
        } while (0)
 
 
        } while (0)
 
 

-#define ao_gpio_set(port, bit, pin, v) stm_gpio_set(port, bit, v)
+#define ao_gpio_set(port, bit, v) stm_gpio_set(port, bit, v)

 
 

-#define ao_gpio_get(port, bit, pin) stm_gpio_get(port, bit)
+#define ao_gpio_get(port, bit) stm_gpio_get(port, bit)

 
 #define ao_gpio_set_bits(port, bits) stm_gpio_set_bits(port, bits)
 
 
 #define ao_gpio_set_bits(port, bits) stm_gpio_set_bits(port, bits)
 


@@ -208,9 +208,9 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s
 
 #define ao_gpio_get_all(port) stm_gpio_get_all(port)
 
 
 #define ao_gpio_get_all(port) stm_gpio_get_all(port)
 

-#define ao_enable_output(port,bit,pin,v) do {                  \
+#define ao_enable_output(port,bit,v) do {                      \

                ao_enable_port(port);                           \
                ao_enable_port(port);                           \

-               ao_gpio_set(port, bit, pin, v);                 \
+               ao_gpio_set(port, bit, v);                      \

                stm_moder_set(port, bit, STM_MODER_OUTPUT);\
        } while (0)
 
                stm_moder_set(port, bit, STM_MODER_OUTPUT);\
        } while (0)
 


@@ -223,7 +223,7 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s
 #define AO_OUTPUT_PUSH_PULL    STM_OTYPER_PUSH_PULL
 #define AO_OUTPUT_OPEN_DRAIN   STM_OTYPER_OPEN_DRAIN
 
 #define AO_OUTPUT_PUSH_PULL    STM_OTYPER_PUSH_PULL
 #define AO_OUTPUT_OPEN_DRAIN   STM_OTYPER_OPEN_DRAIN
 

-#define ao_gpio_set_output_mode(port,bit,pin,mode) \
+#define ao_gpio_set_output_mode(port,bit,mode) \

        stm_otyper_set(port, pin, mode)
 
 #define ao_gpio_set_mode(port,bit,mode) do {                           \
        stm_otyper_set(port, pin, mode)
 
 #define ao_gpio_set_mode(port,bit,mode) do {                           \


@@ -248,8 +248,8 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s
                stm_moder_set(port, bit, STM_MODER_INPUT);      \
        } while (0)
 
                stm_moder_set(port, bit, STM_MODER_INPUT);      \
        } while (0)
 

-#define ao_set_output(port, bit, pin, v) do {                  \
-               ao_gpio_set(port, bit, pin, v);                 \
+#define ao_set_output(port, bit, v) do {                       \
+               ao_gpio_set(port, bit, v);                      \

                stm_moder_set(port, bit, STM_MODER_OUTPUT);     \
        } while (0)
 
                stm_moder_set(port, bit, STM_MODER_OUTPUT);     \
        } while (0)
 

diff --git a/src/stm/ao_led.c b/src/stm/ao_led.c
index bd83f4e427cdb0c00d2f120799f8cc350501d201..481a6e87f138e782d21fa372fc34482810a9d393 100644 (file)
--- a/src/stm/ao_led.c
+++ b/src/stm/ao_led.c
@@ -83,7 +83,7 @@ ao_led_on(AO_LED_TYPE colors)
        AO_LED_TYPE i;
        for (i = 0; i < N_LED; i++)
                if (colors & (1 << i))
        AO_LED_TYPE i;
        for (i = 0; i < N_LED; i++)
                if (colors & (1 << i))

-                       ao_gpio_set(ao_leds[i].port, ao_leds[i].pin, foo, 1);
+                       ao_gpio_set(ao_leds[i].port, ao_leds[i].pin, 1);

 #else
 #ifdef LED_PORT
        LED_PORT->bsrr = (colors & ao_led_enable);
 #else
 #ifdef LED_PORT
        LED_PORT->bsrr = (colors & ao_led_enable);


@@ -105,7 +105,7 @@ ao_led_off(AO_LED_TYPE colors)
        AO_LED_TYPE i;
        for (i = 0; i < N_LED; i++)
                if (colors & (1 << i))
        AO_LED_TYPE i;
        for (i = 0; i < N_LED; i++)
                if (colors & (1 << i))

-                       ao_gpio_set(ao_leds[i].port, ao_leds[i].pin, foo, 0);
+                       ao_gpio_set(ao_leds[i].port, ao_leds[i].pin, 0);

 #else
 #ifdef LED_PORT
        LED_PORT->bsrr = (uint32_t) (colors & ao_led_enable) << 16;
 #else
 #ifdef LED_PORT
        LED_PORT->bsrr = (uint32_t) (colors & ao_led_enable) << 16;


@@ -137,7 +137,7 @@ ao_led_toggle(AO_LED_TYPE colors)
        AO_LED_TYPE i;
        for (i = 0; i < N_LED; i++)
                if (colors & (1 << i))
        AO_LED_TYPE i;
        for (i = 0; i < N_LED; i++)
                if (colors & (1 << i))

-                       ao_gpio_set(ao_leds[i].port, ao_leds[i].pin, foo, ~ao_gpio_get(ao_leds[i].port, ao_leds[i].pin, foo));
+                       ao_gpio_set(ao_leds[i].port, ao_leds[i].pin, ~ao_gpio_get(ao_leds[i].port, ao_leds[i].pin));

 #else
 #ifdef LED_PORT
        LED_PORT->odr ^= (colors & ao_led_enable);
 #else
 #ifdef LED_PORT
        LED_PORT->odr ^= (colors & ao_led_enable);


@@ -173,7 +173,7 @@ ao_led_init(AO_LED_TYPE enable)
        ao_led_enable = enable;
 #if LED_PER_LED
        for (bit = 0; bit < N_LED; bit++)
        ao_led_enable = enable;
 #if LED_PER_LED
        for (bit = 0; bit < N_LED; bit++)

-               ao_enable_output(ao_leds[bit].port, ao_leds[bit].pin, foo, 0);
+               ao_enable_output(ao_leds[bit].port, ao_leds[bit].pin, 0);

 #else
 #ifdef LED_PORT
        stm_rcc.ahbenr |= (1 << LED_PORT_ENABLE);
 #else
 #ifdef LED_PORT
        stm_rcc.ahbenr |= (1 << LED_PORT_ENABLE);

diff --git a/src/stm/ao_serial_stm.c b/src/stm/ao_serial_stm.c
index 2afee5b5da3bd9cc2b9b957e3056cdd1cbc2f9b7..c1a2f1bdda0c1a509db01993f0a7fa6f71b6b98e 100644 (file)
--- a/src/stm/ao_serial_stm.c
+++ b/src/stm/ao_serial_stm.c
@@ -33,7 +33,7 @@ _ao_usart_tx_start(struct ao_stm_usart *usart)
 {
        if (!ao_fifo_empty(usart->tx_fifo)) {
 #if HAS_SERIAL_SW_FLOW
 {
        if (!ao_fifo_empty(usart->tx_fifo)) {
 #if HAS_SERIAL_SW_FLOW

-               if (usart->gpio_cts && ao_gpio_get(usart->gpio_cts, usart->pin_cts, foo) == 1) {
+               if (usart->gpio_cts && ao_gpio_get(usart->gpio_cts, usart->pin_cts) == 1) {

                        ao_exti_enable(usart->gpio_cts, usart->pin_cts);
                        return 0;
                }
                        ao_exti_enable(usart->gpio_cts, usart->pin_cts);
                        return 0;
                }


@@ -73,7 +73,7 @@ _ao_usart_rx(struct ao_stm_usart *usart, int is_stdin)
                         * for it to drain a bunch
                         */
                        if (usart->gpio_rts && ao_fifo_mostly(usart->rx_fifo)) {
                         * for it to drain a bunch
                         */
                        if (usart->gpio_rts && ao_fifo_mostly(usart->rx_fifo)) {

-                               ao_gpio_set(usart->gpio_rts, usart->pin_rts, usart->pin_rts, 1);
+                               ao_gpio_set(usart->gpio_rts, usart->pin_rts, 1);

                                usart->rts = 0;
                        }
 #endif
                                usart->rts = 0;
                        }
 #endif


@@ -118,7 +118,7 @@ _ao_usart_pollchar(struct ao_stm_usart *usart)
 #if HAS_SERIAL_SW_FLOW
                /* If we've cleared RTS, check if there's space now and turn it back on */
                if (usart->gpio_rts && usart->rts == 0 && ao_fifo_barely(usart->rx_fifo)) {
 #if HAS_SERIAL_SW_FLOW
                /* If we've cleared RTS, check if there's space now and turn it back on */
                if (usart->gpio_rts && usart->rts == 0 && ao_fifo_barely(usart->rx_fifo)) {

-                       ao_gpio_set(usart->gpio_rts, usart->pin_rts, foo, 0);
+                       ao_gpio_set(usart->gpio_rts, usart->pin_rts, 0);

                        usart->rts = 1;
                }
 #endif
                        usart->rts = 1;
                }
 #endif


@@ -403,7 +403,7 @@ ao_serial_set_sw_rts_cts(struct ao_stm_usart *usart,
 {
        /* Pull RTS low to note that there's space in the FIFO
         */
 {
        /* Pull RTS low to note that there's space in the FIFO
         */

-       ao_enable_output(port_rts, pin_rts, foo, 0);
+       ao_enable_output(port_rts, pin_rts, 0);

        usart->gpio_rts = port_rts;
        usart->pin_rts = pin_rts;
        usart->rts = 1;
        usart->gpio_rts = port_rts;
        usart->pin_rts = pin_rts;
        usart->rts = 1;

diff --git a/src/stmf0/ao_arch_funcs.h b/src/stmf0/ao_arch_funcs.h
index 96c033f9712ce379f481c43d4fe621e52f663e2d..70f273d3ba46ce081ca8326113c16582668ca627 100644 (file)
--- a/src/stmf0/ao_arch_funcs.h
+++ b/src/stmf0/ao_arch_funcs.h
@@ -168,8 +168,8 @@ ao_spi_try_get_mask(struct stm_gpio *reg, uint16_t mask, uint8_t bus, uint32_t s
                ao_spi_put(bus);                \
        } while (0)
 
                ao_spi_put(bus);                \
        } while (0)
 

-#define ao_spi_get_bit(reg,bit,pin,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
-#define ao_spi_put_bit(reg,bit,pin,bus) ao_spi_put_mask(reg,(1<<bit),bus)
+#define ao_spi_get_bit(reg,bit,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
+#define ao_spi_put_bit(reg,bit,bus) ao_spi_put_mask(reg,(1<<bit),bus)

 
 #if AO_POWER_MANAGEMENT
 extern struct ao_power ao_power_gpioa;
 
 #if AO_POWER_MANAGEMENT
 extern struct ao_power ao_power_gpioa;


@@ -212,13 +212,13 @@ static inline void ao_disable_port(struct stm_gpio *port)
        }
 }
 
        }
 }
 

-#define ao_gpio_set(port, bit, pin, v) stm_gpio_set(port, bit, v)
+#define ao_gpio_set(port, bit, v) stm_gpio_set(port, bit, v)

 
 

-#define ao_gpio_get(port, bit, pin) stm_gpio_get(port, bit)
+#define ao_gpio_get(port, bit) stm_gpio_get(port, bit)

 
 

-#define ao_enable_output(port,bit,pin,v) do {                  \
+#define ao_enable_output(port,bit,v) do {                      \

                ao_enable_port(port);                           \
                ao_enable_port(port);                           \

-               ao_gpio_set(port, bit, pin, v);                 \
+               ao_gpio_set(port, bit, v);                      \

                stm_moder_set(port, bit, STM_MODER_OUTPUT);\
        } while (0)
 
                stm_moder_set(port, bit, STM_MODER_OUTPUT);\
        } while (0)
 


@@ -238,7 +238,7 @@ static inline void ao_disable_port(struct stm_gpio *port)
        } while (0)
 
 #define ao_enable_cs(port,bit) do {                            \
        } while (0)
 
 #define ao_enable_cs(port,bit) do {                            \

-               ao_enable_output(port, bit, pin, 1);            \
+               ao_enable_output(port, bit, 1);         \

        } while (0)
 
 #define ao_spi_init_cs(port, mask) do {                                \
        } while (0)
 
 #define ao_spi_init_cs(port, mask) do {                                \

diff --git a/src/stmf0/ao_beep_stm.c b/src/stmf0/ao_beep_stm.c
index abcc116c706c2335f86ce5c174fcf63076d1bdef..31af7f4a00ab74d19fc2fa2a54808ba286630b87 100644 (file)
--- a/src/stmf0/ao_beep_stm.c
+++ b/src/stmf0/ao_beep_stm.c
@@ -386,7 +386,7 @@ ao_beep_for(uint8_t beep, uint16_t ticks)
 void
 ao_beep_init(void)
 {
 void
 ao_beep_init(void)
 {

-       ao_enable_output(BEEPER_PORT, BEEPER_PIN, BEEPER, 0);
+       ao_enable_output(BEEPER_PORT, BEEPER_PIN, 0);

 
        /* Leave the timer off until requested */
        stm_rcc_enr &= ~(1 << STM_RCC_TIMER);
 
        /* Leave the timer off until requested */
        stm_rcc_enr &= ~(1 << STM_RCC_TIMER);

diff --git a/src/teleballoon-v2.0/ao_pins.h b/src/teleballoon-v2.0/ao_pins.h
index d98e85d782521039d4b3576c40d48ac51d7f1d66..4f27bad69a15b988e0a9d4139ac362431c9abdf2 100644 (file)
--- a/src/teleballoon-v2.0/ao_pins.h
+++ b/src/teleballoon-v2.0/ao_pins.h
@@ -142,9 +142,6 @@
 #define AO_IGNITER_MAIN_PORT   (&stm_gpioa)
 #define AO_IGNITER_MAIN_PIN    9
 
 #define AO_IGNITER_MAIN_PORT   (&stm_gpioa)
 #define AO_IGNITER_MAIN_PIN    9
 

-#define AO_IGNITER_SET_DROGUE(v)       stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
-#define AO_IGNITER_SET_MAIN(v)         stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
-

 /*
  * ADC
  */
 /*
  * ADC
  */

diff --git a/src/telemega-v0.1/ao_pins.h b/src/telemega-v0.1/ao_pins.h
index 94e77f9864bce76cbd64887d0593a6e1bba907da..64535c30b1714f6bef23a79d893cea790695ef15 100644 (file)
--- a/src/telemega-v0.1/ao_pins.h
+++ b/src/telemega-v0.1/ao_pins.h
@@ -165,9 +165,6 @@
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 

-#define AO_IGNITER_SET_DROGUE(v)       stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
-#define AO_IGNITER_SET_MAIN(v)         stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
-

 /*
  * ADC
  */
 /*
  * ADC
  */

diff --git a/src/telemega-v1.0/ao_pins.h b/src/telemega-v1.0/ao_pins.h
index d44394f0aad381a684046ece8280b2de745321b4..354da6a46210c07cfbb9eb28bea68858961977e5 100644 (file)
--- a/src/telemega-v1.0/ao_pins.h
+++ b/src/telemega-v1.0/ao_pins.h
@@ -165,9 +165,6 @@
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 

-#define AO_IGNITER_SET_DROGUE(v)       stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
-#define AO_IGNITER_SET_MAIN(v)         stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
-

 /*
  * ADC
  */
 /*
  * ADC
  */

diff --git a/src/telemega-v2.0/ao_pins.h b/src/telemega-v2.0/ao_pins.h
index 42c00c947924b53e354c29ee4331e4ead015c1ea..46207884cdead83ea566e06466bb14647154b5ce 100644 (file)
--- a/src/telemega-v2.0/ao_pins.h
+++ b/src/telemega-v2.0/ao_pins.h
@@ -165,9 +165,6 @@
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 

-#define AO_IGNITER_SET_DROGUE(v)       stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
-#define AO_IGNITER_SET_MAIN(v)         stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
-

 /*
  * ADC
  */
 /*
  * ADC
  */

diff --git a/src/telemega-v3.0/ao_pins.h b/src/telemega-v3.0/ao_pins.h
index 73278600cee6074e2090d06a6b24c1dbe30fc2b0..ddcd0eb9a98a8e47b1ecff3438d6c7e2cfcfd34b 100644 (file)
--- a/src/telemega-v3.0/ao_pins.h
+++ b/src/telemega-v3.0/ao_pins.h
@@ -165,9 +165,6 @@
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 

-#define AO_IGNITER_SET_DROGUE(v)       stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
-#define AO_IGNITER_SET_MAIN(v)         stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
-

 /*
  * ADC
  */
 /*
  * ADC
  */

diff --git a/src/telemetrum-v2.0/ao_pins.h b/src/telemetrum-v2.0/ao_pins.h
index d26a5193950d50e5015cb3e02c3650a595e5249a..47f6dd2ad86fd420a202041fbb121af437249f17 100644 (file)
--- a/src/telemetrum-v2.0/ao_pins.h
+++ b/src/telemetrum-v2.0/ao_pins.h
@@ -141,9 +141,6 @@
 #define AO_IGNITER_MAIN_PORT   (&stm_gpioa)
 #define AO_IGNITER_MAIN_PIN    9
 
 #define AO_IGNITER_MAIN_PORT   (&stm_gpioa)
 #define AO_IGNITER_MAIN_PIN    9
 

-#define AO_IGNITER_SET_DROGUE(v)       stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
-#define AO_IGNITER_SET_MAIN(v)         stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
-

 /*
  * ADC
  */
 /*
  * ADC
  */

diff --git a/src/telemetrum-v3.0/ao_pins.h b/src/telemetrum-v3.0/ao_pins.h
index 6d4369c92f1056b21b249c793b908f1d594f7a1a..a8043bba4a88be373be9f95d44f05a7014441671 100644 (file)
--- a/src/telemetrum-v3.0/ao_pins.h
+++ b/src/telemetrum-v3.0/ao_pins.h
@@ -141,9 +141,6 @@
 #define AO_IGNITER_MAIN_PORT   (&stm_gpioa)
 #define AO_IGNITER_MAIN_PIN    9
 
 #define AO_IGNITER_MAIN_PORT   (&stm_gpioa)
 #define AO_IGNITER_MAIN_PIN    9
 

-#define AO_IGNITER_SET_DROGUE(v)       stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
-#define AO_IGNITER_SET_MAIN(v)         stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
-

 /*
  * ADC
  */
 /*
  * ADC
  */

diff --git a/src/telemini-v3.0/ao_pins.h b/src/telemini-v3.0/ao_pins.h
index 17cff2aeb0e53497316fcc34e718888f9484d791..546d91e04870e5af7fc56f5290891e3b512eb0a2 100644 (file)
--- a/src/telemini-v3.0/ao_pins.h
+++ b/src/telemini-v3.0/ao_pins.h
@@ -165,11 +165,9 @@ struct ao_adc {
 
 #define AO_IGNITER_DROGUE_PORT (&stm_gpiob)
 #define AO_IGNITER_DROGUE_PIN  7
 
 #define AO_IGNITER_DROGUE_PORT (&stm_gpiob)
 #define AO_IGNITER_DROGUE_PIN  7

-#define AO_IGNITER_SET_DROGUE(v)       ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)

 
 #define AO_IGNITER_MAIN_PORT   (&stm_gpiob)
 #define AO_IGNITER_MAIN_PIN    6
 
 #define AO_IGNITER_MAIN_PORT   (&stm_gpiob)
 #define AO_IGNITER_MAIN_PIN    6

-#define AO_IGNITER_SET_MAIN(v)         ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, v)

 
 #define AO_SENSE_DROGUE(p)     ((p)->adc.sense_a)
 #define AO_SENSE_MAIN(p)       ((p)->adc.sense_m)
 
 #define AO_SENSE_DROGUE(p)     ((p)->adc.sense_a)
 #define AO_SENSE_MAIN(p)       ((p)->adc.sense_m)

diff --git a/src/telemini-v3.0/ao_telemini.c b/src/telemini-v3.0/ao_telemini.c
index a2c0a59886cce8209c5a89c74e8efed2906ea8e5..66f75f0ab0dc182fb523e0199aa4d0520dd374d8 100644 (file)
--- a/src/telemini-v3.0/ao_telemini.c
+++ b/src/telemini-v3.0/ao_telemini.c
@@ -26,7 +26,7 @@ ao_check_recovery(void)
        ao_enable_input(AO_RECOVERY_PORT, AO_RECOVERY_PIN, AO_RECOVERY_MODE);
        for (i = 0; i < 100; i++)
                ao_arch_nop();
        ao_enable_input(AO_RECOVERY_PORT, AO_RECOVERY_PIN, AO_RECOVERY_MODE);
        for (i = 0; i < 100; i++)
                ao_arch_nop();

-       if (ao_gpio_get(AO_RECOVERY_PORT, AO_RECOVERY_PIN, AO_RECOVERY) == AO_RECOVERY_VALUE) {
+       if (ao_gpio_get(AO_RECOVERY_PORT, AO_RECOVERY_PIN) == AO_RECOVERY_VALUE) {

                ao_flight_force_idle = 1;
                ao_force_freq = 1;
        }
                ao_flight_force_idle = 1;
                ao_force_freq = 1;
        }