diff --git a/src/arm/96boards.c b/src/arm/96boards.c index ae31228..3cbc765 100644 --- a/src/arm/96boards.c +++ b/src/arm/96boards.c @@ -103,92 +103,92 @@ mraa_96boards_pininfo(mraa_board_t* board, int index, int sysfs_pin, int is_gpio static mraa_result_t mraa_db410c_mmap_unsetup() { - if (mmap_reg == NULL) { - syslog(LOG_WARNING, "db410c mmap: null register nothing to unsetup"); - return MRAA_ERROR_INVALID_RESOURCE; - } - munmap(mmap_reg, mmap_size); - mmap_reg = NULL; - close(mmap_fd); + if (mmap_reg == NULL) { + syslog(LOG_WARNING, "db410c mmap: null register nothing to unsetup"); + return MRAA_ERROR_INVALID_RESOURCE; + } + munmap(mmap_reg, mmap_size); + mmap_reg = NULL; + close(mmap_fd); - return MRAA_SUCCESS; + return MRAA_SUCCESS; } mraa_result_t mraa_db410c_mmap_write(mraa_gpio_context dev, int value) { - uint32_t offset = (0x1000 * dev->pin); + uint32_t offset = (0x1000 * dev->pin); - if (value) { - *(volatile uint32_t*) (mmap_reg + offset + 0x04) |= (uint32_t) (1 << 1); - } else { - *(volatile uint32_t*) (mmap_reg + offset + 0x04) &= ~(uint32_t) (1 << 1); - } + if (value) { + *(volatile uint32_t*) (mmap_reg + offset + 0x04) |= (uint32_t)(1 << 1); + } else { + *(volatile uint32_t*) (mmap_reg + offset + 0x04) &= ~(uint32_t)(1 << 1); + } - return MRAA_SUCCESS; + return MRAA_SUCCESS; } int mraa_db410c_mmap_read(mraa_gpio_context dev) { - uint32_t value; - uint32_t offset = (0x1000 * dev->pin); + uint32_t value; + uint32_t offset = (0x1000 * dev->pin); - value = *(volatile uint32_t*) (mmap_reg + offset + 0x04); - if (value & (uint32_t) (1 << 0)) { - return 1; - } + value = *(volatile uint32_t*) (mmap_reg + offset + 0x04); + if (value & (uint32_t)(1 << 0)) { + return 1; + } - return 0; + return 0; } mraa_result_t mraa_db410c_mmap_setup(mraa_gpio_context dev, mraa_boolean_t en) { - if (dev == NULL) { - syslog(LOG_ERR, "db410c mmap: context not valid"); - return MRAA_ERROR_INVALID_HANDLE; - } + if (dev == NULL) { + syslog(LOG_ERR, "db410c mmap: context not valid"); + return MRAA_ERROR_INVALID_HANDLE; + } - /* disable mmap if already enabled */ - if (en == 0) { - if (dev->mmap_write == NULL && dev->mmap_read == NULL) { - syslog(LOG_ERR, "db410c mmap: can't disable disabled mmap gpio"); - return MRAA_ERROR_INVALID_PARAMETER; - } - dev->mmap_write = NULL; - dev->mmap_read = NULL; - mmap_count--; - if (mmap_count == 0) { - return mraa_db410c_mmap_unsetup(); - } - return MRAA_SUCCESS; - } + /* disable mmap if already enabled */ + if (en == 0) { + if (dev->mmap_write == NULL && dev->mmap_read == NULL) { + syslog(LOG_ERR, "db410c mmap: can't disable disabled mmap gpio"); + return MRAA_ERROR_INVALID_PARAMETER; + } + dev->mmap_write = NULL; + dev->mmap_read = NULL; + mmap_count--; + if (mmap_count == 0) { + return mraa_db410c_mmap_unsetup(); + } + return MRAA_SUCCESS; + } - if (dev->mmap_write != NULL && dev->mmap_read != NULL) { - syslog(LOG_ERR, "db410c mmap: can't enable enabled mmap gpio"); - return MRAA_ERROR_INVALID_PARAMETER; - } + if (dev->mmap_write != NULL && dev->mmap_read != NULL) { + syslog(LOG_ERR, "db410c mmap: can't enable enabled mmap gpio"); + return MRAA_ERROR_INVALID_PARAMETER; + } - if (mmap_reg == NULL) { - if ((mmap_fd = open(MMAP_PATH, O_RDWR)) < 0) { - syslog(LOG_ERR, "db410c mmap: unable to open /dev/mem"); - return MRAA_ERROR_INVALID_HANDLE; - } - mmap_reg = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED, mmap_fd, DB410C_MMAP_REG); + if (mmap_reg == NULL) { + if ((mmap_fd = open(MMAP_PATH, O_RDWR)) < 0) { + syslog(LOG_ERR, "db410c mmap: unable to open /dev/mem"); + return MRAA_ERROR_INVALID_HANDLE; + } + mmap_reg = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED, mmap_fd, DB410C_MMAP_REG); - if (mmap_reg == MAP_FAILED) { - syslog(LOG_ERR, "db410c mmap: failed to mmap"); - mmap_reg = NULL; - close(mmap_fd); - return MRAA_ERROR_NO_RESOURCES; - } - } - dev->mmap_write = &mraa_db410c_mmap_write; - dev->mmap_read = &mraa_db410c_mmap_read; - mmap_count++; + if (mmap_reg == MAP_FAILED) { + syslog(LOG_ERR, "db410c mmap: failed to mmap"); + mmap_reg = NULL; + close(mmap_fd); + return MRAA_ERROR_NO_RESOURCES; + } + } + dev->mmap_write = &mraa_db410c_mmap_write; + dev->mmap_read = &mraa_db410c_mmap_read; + mmap_count++; - return MRAA_SUCCESS; + return MRAA_SUCCESS; } mraa_board_t* @@ -203,11 +203,11 @@ mraa_96boards() return NULL; } - b->adv_func = (mraa_adv_func_t*) calloc(1, sizeof(mraa_adv_func_t)); - if (b->adv_func == NULL) { - free(b); - return NULL; - } + b->adv_func = (mraa_adv_func_t*) calloc(1, sizeof(mraa_adv_func_t)); + if (b->adv_func == NULL) { + free(b); + return NULL; + } // pin mux for buses are setup by default by kernel so tell mraa to ignore them b->no_bus_mux = 1; @@ -219,20 +219,20 @@ mraa_96boards() b->platform_name = PLATFORM_NAME_DB410C; ls_gpio_pins = db410c_ls_gpio_pins; chardev_map = &db410c_chardev_map; - b->uart_dev[0].device_path = (char *)db410c_serialdev[0]; - b->uart_dev[1].device_path = (char *)db410c_serialdev[1]; + b->uart_dev[0].device_path = (char*) db410c_serialdev[0]; + b->uart_dev[1].device_path = (char*) db410c_serialdev[1]; b->adv_func->gpio_mmap_setup = &mraa_db410c_mmap_setup; } else if (mraa_file_contains(DT_BASE "/model", "HiKey Development Board")) { b->platform_name = PLATFORM_NAME_HIKEY; ls_gpio_pins = hikey_ls_gpio_pins; chardev_map = &hikey_chardev_map; - b->uart_dev[0].device_path = (char *)hikey_serialdev[0]; - b->uart_dev[1].device_path = (char *)hikey_serialdev[1]; + b->uart_dev[0].device_path = (char*) hikey_serialdev[0]; + b->uart_dev[1].device_path = (char*) hikey_serialdev[1]; } else if (mraa_file_contains(DT_BASE "/model", "s900")) { b->platform_name = PLATFORM_NAME_BBGUM; ls_gpio_pins = bbgum_ls_gpio_pins; - b->uart_dev[0].device_path = (char *)bbgum_serialdev[0]; - b->uart_dev[1].device_path = (char *)bbgum_serialdev[1]; + b->uart_dev[0].device_path = (char*) bbgum_serialdev[0]; + b->uart_dev[1].device_path = (char*) bbgum_serialdev[1]; } }