Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

aio.c: pass channel to mraa_aio_init_internal

Browse Source 
This fixes previous broken commit because dev is not defined before
_internal_init but since fp is taken during internal init we need to know the
channel number. This does not affect the internal override API.

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2016-04-25 12:17:31 +01:00
parent 56e45f6de5
commit b258867c37
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/aio/aio.c
View File

@@ -56,7 +56,7 @@ aio_get_valid_fp(mraa_aio_context dev)
} }
static mraa_aio_context static mraa_aio_context
mraa_aio_init_internal(mraa_adv_func_t* func_table, int aio) mraa_aio_init_internal(mraa_adv_func_t* func_table, int aio, unsigned int channel)
{ {
mraa_aio_context dev = calloc(1, sizeof(struct _aio)); mraa_aio_context dev = calloc(1, sizeof(struct _aio));
if (dev == NULL) { if (dev == NULL) {
@@ -72,6 +72,8 @@ mraa_aio_init_internal(mraa_adv_func_t* func_table, int aio)
return NULL; return NULL;
} }
dev->channel = channel;
// Open valid analog input file and get the pointer. // Open valid analog input file and get the pointer.
if (MRAA_SUCCESS != aio_get_valid_fp(dev)) { if (MRAA_SUCCESS != aio_get_valid_fp(dev)) {
free(dev); free(dev);
@@ -122,15 +124,13 @@ mraa_aio_init(unsigned int aio)
} }
} }
dev->channel = board->pins[pin].aio.pinmap;
dev->value_bit = DEFAULT_BITS;
// Create ADC device connected to specified channel // Create ADC device connected to specified channel
mraa_aio_context dev = mraa_aio_init_internal(board->adv_func, aio); mraa_aio_context dev = mraa_aio_init_internal(board->adv_func, aio, board->pins[pin].aio.pinmap);
if (dev == NULL) { if (dev == NULL) {
syslog(LOG_ERR, "aio: Insufficient memory for specified input channel %d", aio); syslog(LOG_ERR, "aio: Insufficient memory for specified input channel %d", aio);
return NULL; return NULL;
} }
dev->value_bit = DEFAULT_BITS;
if (IS_FUNC_DEFINED(dev, aio_init_pre)) { if (IS_FUNC_DEFINED(dev, aio_init_pre)) {
mraa_result_t pre_ret = (dev->advance_func->aio_init_pre(aio)); mraa_result_t pre_ret = (dev->advance_func->aio_init_pre(aio));