alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

upm-c: remove uint8_t limit from pin/bus variables in structs

Browse Source 
This removes unnecessary uint8 types from C driver structs that prevented some sensors from being initialized when connected to a MRAA subplatform.

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Mihai Tudor Panu 2018-09-04 06:31:26 -07:00
parent 89e2ec870a
commit 07a9af07fe
11 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ad8232/ad8232.c
View File

@ -35,13 +35,9 @@ ad8232_context ad8232_init(int lo_plus, int lo_minus, int output,
return NULL;
}
dev->gpio_lo_plus_pin = lo_plus;
dev->gpio_lo_minus_pin = lo_minus;
dev->aio_pin = output;
dev->aio = mraa_aio_init(dev->aio_pin);
dev->gpio_lo_plus = mraa_gpio_init(dev->gpio_lo_plus_pin);
dev->gpio_lo_minus = mraa_gpio_init(dev->gpio_lo_minus_pin);
dev->aio = mraa_aio_init(output);
dev->gpio_lo_plus = mraa_gpio_init(lo_plus);
dev->gpio_lo_minus = mraa_gpio_init(lo_minus);
if (dev->aio == NULL || dev->gpio_lo_minus == NULL ||
dev->gpio_lo_plus == NULL){

3
src/ad8232/ad8232.h
View File

@ -51,9 +51,6 @@ typedef struct _ad8232_context {
mraa_aio_context aio;
mraa_gpio_context gpio_lo_plus;
mraa_gpio_context gpio_lo_minus;
uint8_t aio_pin;
uint8_t gpio_lo_plus_pin;
uint8_t gpio_lo_minus_pin;
int a_res;
} *ad8232_context;

4
src/button/button.c
View File

@ -42,9 +42,7 @@ button_context button_init(int pin){
return NULL;
}
dev->gpio_pin = pin;
dev->gpio = mraa_gpio_init(dev->gpio_pin);
dev->gpio = mraa_gpio_init(pin);
mraa_gpio_dir(dev->gpio, MRAA_GPIO_IN);
dev->isr_installed = false;

1
src/button/button.h
View File

@ -61,7 +61,6 @@
typedef struct _button_context {
mraa_gpio_context gpio;
uint8_t gpio_pin;
bool isr_installed;
} *button_context;

3
src/collision/collision.c
View File

@ -39,8 +39,7 @@ collision_context collision_init(int pin) {
if (!dev)
return NULL;
dev->gpio_pin = pin;
dev->gpio = mraa_gpio_init(dev->gpio_pin);
dev->gpio = mraa_gpio_init(pin);
if(mraa_gpio_dir(dev->gpio, MRAA_GPIO_IN) != MRAA_SUCCESS)
{

1
src/collision/collision.h
View File

@ -45,7 +45,6 @@
*/
typedef struct _collision_context {
mraa_gpio_context gpio;
uint8_t gpio_pin;
} *collision_context;
/**

4
src/m24lr64e/m24lr64e.h
View File

@ -113,9 +113,9 @@ typedef enum {
*/
typedef struct _m24lr64e_context {
mraa_i2c_context i2c;
uint8_t bus;
int bus;
uint8_t address;
m24lr64e_access_mode mode;
m24lr64e_access_mode mode;
} *m24lr64e_context;
/**

6
src/mq303a/mq303a.c
View File

@ -41,10 +41,8 @@ mq303a_context mq303a_init(int pin, int heater_pin) {
if (!dev)
return NULL;
dev->aio_pin = pin;
dev->gpio_pin = heater_pin;
dev->aio = mraa_aio_init(dev->aio_pin);
dev->gpio = mraa_gpio_init(dev->gpio_pin);
dev->aio = mraa_aio_init(pin);
dev->gpio = mraa_gpio_init(heater_pin);
if(mraa_gpio_dir(dev->gpio, MRAA_GPIO_OUT) != MRAA_SUCCESS)
{

2
src/mq303a/mq303a.h
View File

@ -43,8 +43,6 @@
typedef struct _mq303a_context {
mraa_gpio_context gpio;
mraa_aio_context aio;
uint8_t gpio_pin;
uint8_t aio_pin;
} *mq303a_context;
/**

4
src/ttp223/ttp223.c
View File

@ -42,9 +42,7 @@ ttp223_context ttp223_init(int pin) {
return NULL;
}
dev->gpio_pin = pin;
dev->gpio = mraa_gpio_init(dev->gpio_pin);
dev->gpio = mraa_gpio_init(pin);
mraa_gpio_dir(dev->gpio, MRAA_GPIO_IN);
dev->isr_installed = false;

1
src/ttp223/ttp223.h
View File

@ -46,7 +46,6 @@
*/
typedef struct _ttp223_context {
mraa_gpio_context gpio;
uint8_t gpio_pin;
bool isr_installed;
} *ttp223_context;