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

uart: use const char* instead of plain char*

Browse Source 
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2015-01-20 16:22:04 +00:00
parent 9cfbc87924
commit 25bd897ec5
6 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/mraa/common.h
View File

@@ -149,7 +149,7 @@ typedef struct {
unsigned int index; /**< ID as exposed in the system */
int rx; /**< uart rx */
int tx; /**< uart tx */
char* device_path; /**< To store "/dev/ttyS1" for example */
const char* device_path; /**< To store "/dev/ttyS1" for example */
/*@}*/
} mraa_uart_dev_t;

7
src/arm/raspberry_pi_b.c
View File

@@ -180,12 +180,7 @@ mraa_raspberry_pi_b()
b->def_uart_dev = 0;
b->uart_dev[0].rx = 10;
b->uart_dev[0].tx = 8;
int uart_path_length = strlen(UART_DEV_PATH) + 1;
b->uart_dev[0].device_path = (char*) malloc(sizeof(char) * uart_path_length);
if (b->uart_dev[0].device_path == NULL) {
goto error;
}
strncpy(b->uart_dev[0].device_path, UART_DEV_PATH, uart_path_length);
b->uart_dev[0].device_path = UART_DEV_PATH;
return b;

2
src/uart/uart.c
View File

@@ -83,7 +83,7 @@ mraa_uart_init(int index)
memset(dev, 0, sizeof(struct _uart));
dev->index = index;
dev->path = plat->uart_dev[index].device_path;
dev->path = (char*) plat->uart_dev[index].device_path;
if (advance_func->uart_init_post != NULL) {
mraa_result_t ret = advance_func->uart_init_post(dev);
if (ret != MRAA_SUCCESS) {

9
src/x86/intel_edison_fab_c.c
View File

@@ -1067,6 +1067,7 @@ mraa_intel_edison_miniboard(mraa_board_t* b)
b->def_uart_dev = 0;
b->uart_dev[0].rx = 26;
b->uart_dev[0].tx = 35;
b->uart_dev[0].device_path = UART_DEV_PATH;
return MRAA_SUCCESS;
}
@@ -1365,13 +1366,7 @@ mraa_intel_edison_fab_c()
b->def_uart_dev = 0;
b->uart_dev[0].rx = 0;
b->uart_dev[0].tx = 1;
int uart_path_length = strlen(UART_DEV_PATH) + 1;
b->uart_dev[0].device_path = (char*) malloc(sizeof(char) * uart_path_length);
if (b->uart_dev[0].device_path == NULL) {
goto error;
}
strncpy(b->uart_dev[0].device_path, UART_DEV_PATH, uart_path_length);
b->uart_dev[0].device_path = UART_DEV_PATH;
int il;
for (il =0; il < MRAA_INTEL_EDISON_PINCOUNT; il++) {

14
src/x86/intel_galileo_rev_d.c
View File

@@ -405,25 +405,15 @@ mraa_intel_galileo_rev_d()
b->spi_bus[0].miso = 12;
b->spi_bus[0].sclk = 13;
int uart_path_length = strlen("/dev/ttyS0") + 1;
b->uart_dev_count = 2;
b->def_uart_dev = 0;
b->uart_dev[0].rx = 0;
b->uart_dev[0].tx = 1;
b->uart_dev[0].device_path = (char*) malloc(sizeof(char) * uart_path_length);
if (b->uart_dev[0].device_path == NULL) {
goto error;
}
strncpy(b->uart_dev[0].device_path, "/dev/ttyS0", uart_path_length);
b->uart_dev[0].device_path = "/dev/ttyS0";
b->uart_dev[1].rx = -1;
b->uart_dev[1].tx = -1;
b->uart_dev[1].device_path = (char*) malloc(sizeof(char) * uart_path_length);
if (b->uart_dev[1].device_path == NULL) {
goto error;
}
strncpy(b->uart_dev[1].device_path, "/dev/ttyS1", uart_path_length);
b->uart_dev[1].device_path = "/dev/ttyS1";
return b;
error:

8
src/x86/intel_galileo_rev_g.c
View File

@@ -746,17 +746,11 @@ mraa_intel_galileo_gen2()
b->spi_bus[0].miso = 12;
b->spi_bus[0].sclk = 13;
int uart_path_length = strlen("/dev/ttyS0") + 1;
b->uart_dev_count = 1;
b->def_uart_dev = 0;
b->uart_dev[0].rx = 0;
b->uart_dev[0].tx = 1;
b->uart_dev[0].device_path = (char*) malloc(sizeof(char) * uart_path_length);
if (b->uart_dev[0].device_path == NULL) {
goto error;
}
strncpy(b->uart_dev[0].device_path, "/dev/ttyS0", uart_path_length);
b->uart_dev[0].device_path = "/dev/ttyS0";
return b;
error: