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

96boards.c: Added Bubblegum 96 board

Browse Source 
- Proper board detection
- Styling refactored using clang-format

Signed-off-by: Fan Jiang <i@fanjiang.me>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Fan Jiang
2016-11-23 21:26:35 +08:00
committed by Brendan Le Foll
parent 68e9399c4c
commit 250590e1ed
2 changed files with 131 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/arm/96boards.c
View File

@@ -25,34 +25,40 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <stdlib.h> #include <mraa/common.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <mraa/common.h>
#include "common.h"
#include "arm/96boards.h" #include "arm/96boards.h"
#include "common.h"
#define DT_BASE "/sys/firmware/devicetree/base" #define DT_BASE "/proc/device-tree"
#define PLATFORM_NAME_DB410C "DB410C" #define PLATFORM_NAME_DB410C "DB410C"
#define PLATFORM_NAME_HIKEY "HIKEY" #define PLATFORM_NAME_HIKEY "HIKEY"
#define PLATFORM_NAME_BBGUM "BBGUM"
int db410c_ls_gpio_pins[MRAA_96BOARDS_LS_GPIO_COUNT] = { int db410c_ls_gpio_pins[MRAA_96BOARDS_LS_GPIO_COUNT] = {
36, 12, 13, 69, 115, 4, 24, 25, 35, 34, 28, 33, 36, 12, 13, 69, 115, 4, 24, 25, 35, 34, 28, 33,
}; };
const char* db410c_serialdev[MRAA_96BOARDS_LS_UART_COUNT] = { "/dev/ttyMSM0", "/dev/ttyMSM1"}; const char* db410c_serialdev[MRAA_96BOARDS_LS_UART_COUNT] = { "/dev/ttyMSM0", "/dev/ttyMSM1" };
int hikey_ls_gpio_pins[MRAA_96BOARDS_LS_GPIO_COUNT] = { int hikey_ls_gpio_pins[MRAA_96BOARDS_LS_GPIO_COUNT] = {
488, 489, 490, 491, 492, 415, 463, 495, 426, 433, 427, 434, 488, 489, 490, 491, 492, 415, 463, 495, 426, 433, 427, 434,
}; };
const char* hikey_serialdev[MRAA_96BOARDS_LS_UART_COUNT] = { "/dev/ttyAMA2", "/dev/ttyAMA3"};
void mraa_96boards_pininfo(mraa_board_t* board, int index, int sysfs_pin, const char* hikey_serialdev[MRAA_96BOARDS_LS_UART_COUNT] = { "/dev/ttyAMA2", "/dev/ttyAMA3" };
char *fmt, ...)
int bbgum_ls_gpio_pins[MRAA_96BOARDS_LS_UART_COUNT] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 155, 154 };
const char* bbgum_serialdev[MRAA_96BOARDS_LS_UART_COUNT] = { "/dev/ttyS3", "/dev/ttyS5" };
void
mraa_96boards_pininfo(mraa_board_t* board, int index, int sysfs_pin, char* fmt, ...)
{ {
va_list arg_ptr; va_list arg_ptr;
if (index > board->phy_pin_count) if (index > board->phy_pin_count)
@@ -70,10 +76,11 @@ void mraa_96boards_pininfo(mraa_board_t* board, int index, int sysfs_pin,
pininfo->gpio.mux_total = 0; pininfo->gpio.mux_total = 0;
} }
mraa_board_t* mraa_96boards() mraa_board_t*
mraa_96boards()
{ {
int i, pin; int i, pin;
int *ls_gpio_pins = NULL; int* ls_gpio_pins = NULL;
char ch; char ch;
mraa_board_t* b = (mraa_board_t*) calloc(1, sizeof(mraa_board_t)); mraa_board_t* b = (mraa_board_t*) calloc(1, sizeof(mraa_board_t));
@@ -97,20 +104,25 @@ mraa_board_t* mraa_96boards()
ls_gpio_pins = hikey_ls_gpio_pins; ls_gpio_pins = hikey_ls_gpio_pins;
b->uart_dev[0].device_path = hikey_serialdev[0]; b->uart_dev[0].device_path = hikey_serialdev[0];
b->uart_dev[1].device_path = hikey_serialdev[1]; b->uart_dev[1].device_path = 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 = bbgum_serialdev[0];
b->uart_dev[1].device_path = bbgum_serialdev[1];
} }
} }
//UART // UART
b->uart_dev_count = MRAA_96BOARDS_LS_UART_COUNT; b->uart_dev_count = MRAA_96BOARDS_LS_UART_COUNT;
b->def_uart_dev = 0; b->def_uart_dev = 0;
//I2C // I2C
b->i2c_bus_count = MRAA_96BOARDS_LS_I2C_COUNT; b->i2c_bus_count = MRAA_96BOARDS_LS_I2C_COUNT;
b->def_i2c_bus = 0; b->def_i2c_bus = 0;
b->i2c_bus[0].bus_id = 0; b->i2c_bus[0].bus_id = 0;
b->i2c_bus[1].bus_id= 1; b->i2c_bus[1].bus_id = 1;
//SPI // SPI
b->spi_bus_count = MRAA_96BOARDS_LS_SPI_COUNT; b->spi_bus_count = MRAA_96BOARDS_LS_SPI_COUNT;
b->spi_bus[0].bus_id = 0; b->spi_bus[0].bus_id = 0;
b->def_spi_bus = 0; b->def_spi_bus = 0;
@@ -152,10 +164,8 @@ mraa_board_t* mraa_96boards()
mraa_96boards_pininfo(b, 21, -1, "I2C1_SDA"); mraa_96boards_pininfo(b, 21, -1, "I2C1_SDA");
mraa_96boards_pininfo(b, 22, -1, "PCM_DI"); mraa_96boards_pininfo(b, 22, -1, "PCM_DI");
// GPIOs are labelled "GPIO-A" through "GPIO-L" // GPIOs are labelled "GPIO-A" through "GPIO-L"
for (i = 0; i < MRAA_96BOARDS_LS_GPIO_COUNT; i++) for (i = 0; i < MRAA_96BOARDS_LS_GPIO_COUNT; i++) {
{ mraa_96boards_pininfo(b, 23 + i, ls_gpio_pins ? ls_gpio_pins[i] : -1, "GPIO-%c", 'A' + i);
mraa_96boards_pininfo(b, 23 + i, ls_gpio_pins ? ls_gpio_pins[i] : -1,
"GPIO-%c", 'A'+i);
} }
mraa_96boards_pininfo(b, 35, -1, "1.8v"); mraa_96boards_pininfo(b, 35, -1, "1.8v");
mraa_96boards_pininfo(b, 36, -1, "SYS_DCIN"); mraa_96boards_pininfo(b, 36, -1, "SYS_DCIN");

35
src/arm/arm.c
View File

@@ -26,11 +26,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "mraa_internal.h"
#include "arm/raspberry_pi.h"
#include "arm/beaglebone.h"
#include "arm/banana.h"
#include "arm/96boards.h" #include "arm/96boards.h"
#include "arm/banana.h"
#include "arm/beaglebone.h"
#include "arm/raspberry_pi.h"
#include "mraa_internal.h"
mraa_platform_t mraa_platform_t
@@ -46,21 +46,19 @@ mraa_arm_platform()
if (strncmp(line, "Hardware", 8) == 0) { if (strncmp(line, "Hardware", 8) == 0) {
if (strstr(line, "BCM2708")) { if (strstr(line, "BCM2708")) {
platform_type = MRAA_RASPBERRY_PI; platform_type = MRAA_RASPBERRY_PI;
} } else if (strstr(line, "BCM2709")) {
else if (strstr(line, "BCM2709")) {
platform_type = MRAA_RASPBERRY_PI; platform_type = MRAA_RASPBERRY_PI;
} } else if (strstr(line, "Generic AM33XX")) {
else if (strstr(line, "Generic AM33XX")) {
platform_type = MRAA_BEAGLEBONE; platform_type = MRAA_BEAGLEBONE;
} } else if (strstr(line, "HiKey Development Board")) {
else if (strstr(line, "HiKey Development Board")) {
platform_type = MRAA_96BOARDS; platform_type = MRAA_96BOARDS;
} } else if (strstr(line, "s900")) {
else if (strstr(line, "sun7i")) { platform_type = MRAA_96BOARDS;
} else if (strstr(line, "sun7i")) {
if (mraa_file_contains("/sys/firmware/devicetree/base/model", "Banana Pro")) { if (mraa_file_contains("/sys/firmware/devicetree/base/model", "Banana Pro")) {
platform_type = MRAA_BANANA; platform_type = MRAA_BANANA;
} } else if (mraa_file_contains("/sys/firmware/devicetree/base/model",
else if (mraa_file_contains("/sys/firmware/devicetree/base/model", "Banana Pi")) { "Banana Pi")) {
platform_type = MRAA_BANANA; platform_type = MRAA_BANANA;
} }
// For old kernels // For old kernels
@@ -69,17 +67,20 @@ mraa_arm_platform()
} }
} }
} }
} }
fclose(fh); fclose(fh);
} }
free(line); free(line);
/* Get compatible string from Device tree for boards that dont have enough info in /proc/cpuinfo */ /* Get compatible string from Device tree for boards that dont have enough info in /proc/cpuinfo
*/
if (platform_type == MRAA_UNKNOWN_PLATFORM) { if (platform_type == MRAA_UNKNOWN_PLATFORM) {
if (mraa_file_contains("/sys/firmware/devicetree/base/compatible", "qcom,apq8016-sbc")) if (mraa_file_contains("/sys/firmware/devicetree/base/compatible", "qcom,apq8016-sbc"))
platform_type = MRAA_96BOARDS; platform_type = MRAA_96BOARDS;
else if (mraa_file_contains("/sys/firmware/devicetree/base/model", "HiKey Development Board")) else if (mraa_file_contains("/sys/firmware/devicetree/base/model",
"HiKey Development Board"))
platform_type = MRAA_96BOARDS;
else if (mraa_file_contains("/proc/device-tree/model", "s900"))
platform_type = MRAA_96BOARDS; platform_type = MRAA_96BOARDS;
} }