X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fintel_galileo_rev_d.c;h=4614492facf5ee46d3a313ef3c3ba2fe8a74f027;hb=6853997a922f5067a242d07395cb8e768f14c4be;hp=7ff6207a98d028fbee26d3973aef8872160c3c70;hpb=5aa5aec661ee747587cf8766a9cd9181ae2babc1;p=contrib%2Fmraa.git

diff --git a/src/intel_galileo_rev_d.c b/src/intel_galileo_rev_d.c
index 7ff6207..4614492 100644
--- a/src/intel_galileo_rev_d.c
+++ b/src/intel_galileo_rev_d.c
@@ -25,12 +25,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "maa.h"
+#include "common.h"
+#include "intel_galileo_rev_d.h"
 
-maa_board_t*
-maa_intel_galileo_rev_d()
+mraa_board_t*
+mraa_intel_galileo_rev_d()
 {
-    maa_board_t* b = (maa_board_t*) malloc(sizeof(maa_board_t));
+    mraa_board_t* b = (mraa_board_t*) malloc(sizeof(mraa_board_t));
     if (b == NULL)
         return NULL;
 
@@ -38,11 +39,11 @@ maa_intel_galileo_rev_d()
     b->gpio_count = 14;
     b->aio_count = 6;
 
-    b->pins = (maa_pininfo_t*) malloc(sizeof(maa_pininfo_t)*25);
+    b->pins = (mraa_pininfo_t*) malloc(sizeof(mraa_pininfo_t)*MRAA_INTEL_GALILEO_REV_D_PINCOUNT);
 
     //GPIO IO0 - IO10
     strncpy(b->pins[0].name, "IO0", 8);
-    b->pins[0].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,0,0};
+    b->pins[0].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,0,0};
     b->pins[0].gpio.pinmap = 50;
     b->pins[0].gpio.parent_id = 0;
     b->pins[0].gpio.mux_total = 1;
@@ -50,29 +51,43 @@ maa_intel_galileo_rev_d()
     b->pins[0].gpio.mux[0].value = 1;
 
     strncpy(b->pins[1].name, "IO1", 8);
-    b->pins[1].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,0,0};
+    b->pins[1].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,0,0};
     b->pins[1].gpio.pinmap = 51;
     b->pins[1].gpio.mux_total = 1;
     b->pins[1].gpio.mux[0].pin = 41;
     b->pins[1].gpio.mux[0].value = 1;
 
     strncpy(b->pins[2].name, "IO2", 8);
-    b->pins[2].capabilites = (maa_pincapabilities_t) {1,1,0,1,0,0,0};
+    b->pins[2].capabilites = (mraa_pincapabilities_t) {1,1,0,1,0,0,0};
     b->pins[2].gpio.pinmap = 32;
     b->pins[2].gpio.mux_total = 1;
     b->pins[2].gpio.mux[0].pin = 31;
     b->pins[2].gpio.mux[0].value = 1;
+    b->pins[2].mmap.gpio.pinmap = 14;
+    strncpy(b->pins[2].mmap.mem_dev, "/dev/uio0", 12);
+    b->pins[2].mmap.gpio.mux_total = 2;
+    b->pins[2].mmap.gpio.mux[0].pin = 31;
+    b->pins[2].mmap.gpio.mux[0].value = 0;
+    b->pins[2].mmap.gpio.mux[1].pin = 14;
+    b->pins[2].mmap.gpio.mux[1].value = 0;
+    b->pins[2].mmap.mem_sz = 0x1000;
+    b->pins[2].mmap.bit_pos = 6;
 
     strncpy(b->pins[3].name, "IO3", 8);
-    b->pins[3].capabilites = (maa_pincapabilities_t) {1,1,1,1,0,0,0};
+    b->pins[3].capabilites = (mraa_pincapabilities_t) {1,1,1,1,0,0,0};
     b->pins[3].gpio.pinmap = 18;
     b->pins[3].gpio.mux_total = 1;
     b->pins[3].gpio.mux[0].pin = 30;
     b->pins[3].gpio.mux[0].value = 1;
-    b->pins[3].fast_gpio.pinmap = 15;
-    b->pins[3].fast_gpio.mux_total = 1;
-    b->pins[3].fast_gpio.mux[0].pin = 30;
-    b->pins[3].fast_gpio.mux[0].value = 0;
+    b->pins[3].mmap.gpio.pinmap = 15;
+    strncpy(b->pins[3].mmap.mem_dev, "/dev/uio0", 12);
+    b->pins[3].mmap.gpio.mux_total = 2;
+    b->pins[3].mmap.gpio.mux[0].pin = 30;
+    b->pins[3].mmap.gpio.mux[0].value = 0;
+    b->pins[3].mmap.gpio.mux[1].pin = 15;
+    b->pins[3].mmap.gpio.mux[1].value = 0;
+    b->pins[3].mmap.mem_sz = 0x1000;
+    b->pins[3].mmap.bit_pos = 7;
     b->pins[3].pwm.pinmap = 3;
     b->pins[3].pwm.parent_id = 0;
     b->pins[3].pwm.mux_total = 1;
@@ -81,12 +96,12 @@ maa_intel_galileo_rev_d()
 
 
     strncpy(b->pins[4].name, "IO4", 8);
-    b->pins[4].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,0,0};
+    b->pins[4].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,0,0};
     b->pins[4].gpio.pinmap = 28;
     b->pins[4].gpio.mux_total = 0;
 
     strncpy(b->pins[5].name, "IO5", 8);
-    b->pins[5].capabilites = (maa_pincapabilities_t) {1,1,1,0,0,0,0};
+    b->pins[5].capabilites = (mraa_pincapabilities_t) {1,1,1,0,0,0,0};
     b->pins[5].gpio.pinmap = 17;
     b->pins[5].gpio.mux_total = 0;
     b->pins[5].pwm.pinmap = 5;
@@ -95,29 +110,32 @@ maa_intel_galileo_rev_d()
 
     strncpy(b->pins[6].name, "IO6", 8);
     b->pins[6].gpio.pinmap = 24;
-    b->pins[6].capabilites = (maa_pincapabilities_t) {1,1,1,0,0,0,0};
+    b->pins[6].capabilites = (mraa_pincapabilities_t) {1,1,1,0,0,0,0};
     b->pins[6].gpio.mux_total = 0;
     b->pins[6].pwm.pinmap = 6;
     b->pins[6].pwm.parent_id = 0;
     b->pins[6].pwm.mux_total = 0;
 
     strncpy(b->pins[7].name, "IO7", 8);
-    b->pins[7].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,0,0};
+    b->pins[7].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,0,0};
     b->pins[7].gpio.pinmap = 27;
     b->pins[7].gpio.mux_total = 0;
 
     strncpy(b->pins[8].name, "IO8", 8);
-    b->pins[8].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,0,0};
+    b->pins[8].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,0,0};
     b->pins[8].gpio.pinmap = 26;
     b->pins[8].gpio.mux_total = 0;
 
     strncpy(b->pins[9].name, "IO9", 8);
-    b->pins[9].capabilites = (maa_pincapabilities_t) {1,1,1,0,0,0,0};
+    b->pins[9].capabilites = (mraa_pincapabilities_t) {1,1,1,0,0,0,0};
     b->pins[9].gpio.pinmap = 19;
     b->pins[9].gpio.mux_total = 0;
+    b->pins[9].pwm.pinmap = 1;
+    b->pins[9].pwm.parent_id = 0;
+    b->pins[9].pwm.mux_total = 0;
 
     strncpy(b->pins[10].name, "IO10", 8);
-    b->pins[10].capabilites = (maa_pincapabilities_t) {1,1,1,0,1,0,0};
+    b->pins[10].capabilites = (mraa_pincapabilities_t) {1,1,1,0,1,0,0};
     b->pins[10].gpio.pinmap = 16;
     b->pins[10].gpio.mux_total = 1;
     b->pins[10].gpio.mux[0].pin = 42;
@@ -133,7 +151,7 @@ maa_intel_galileo_rev_d()
     b->pins[10].spi.mux[0].value = 0;
 
     strncpy(b->pins[11].name, "IO11", 8);
-    b->pins[11].capabilites = (maa_pincapabilities_t) {1,1,1,0,1,0,0};
+    b->pins[11].capabilites = (mraa_pincapabilities_t) {1,1,1,0,1,0,0};
     b->pins[11].gpio.pinmap = 25;
     b->pins[11].gpio.mux_total = 1;
     b->pins[11].gpio.mux[0].pin = 43;
@@ -142,14 +160,14 @@ maa_intel_galileo_rev_d()
     b->pins[11].pwm.parent_id = 0;
     b->pins[11].pwm.mux_total = 1;
     b->pins[11].pwm.mux[0].pin = 43;
-    b->pins[11].gpio.mux[0].value = 1;
+    b->pins[11].pwm.mux[0].value = 1;
     b->pins[11].spi.pinmap = 1;
     b->pins[11].spi.mux_total = 1;
     b->pins[11].spi.mux[0].pin = 43;
     b->pins[11].spi.mux[0].value = 0;
 
     strncpy(b->pins[12].name, "IO12", 8);
-    b->pins[12].capabilites = (maa_pincapabilities_t) {1,1,0,0,1,0,0};
+    b->pins[12].capabilites = (mraa_pincapabilities_t) {1,1,0,0,1,0,0};
     b->pins[12].gpio.pinmap = 38;
     b->pins[12].gpio.mux_total = 1;
     b->pins[12].gpio.mux[0].pin = 54;
@@ -160,7 +178,7 @@ maa_intel_galileo_rev_d()
     b->pins[12].spi.mux[0].value = 0;
 
     strncpy(b->pins[13].name, "IO13", 8);
-    b->pins[13].capabilites = (maa_pincapabilities_t) {1,1,0,0,1,0,0};
+    b->pins[13].capabilites = (mraa_pincapabilities_t) {1,1,0,0,1,0,0};
     b->pins[13].gpio.pinmap = 39;
     b->pins[13].gpio.mux_total = 1;
     b->pins[13].gpio.mux[0].pin = 55;
@@ -171,7 +189,7 @@ maa_intel_galileo_rev_d()
     b->pins[13].spi.mux[0].value = 0;
 
     strncpy(b->pins[14].name, "A0", 8);
-    b->pins[14].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,0,1};
+    b->pins[14].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,0,1};
     b->pins[14].gpio.pinmap = 44;
     b->pins[14].gpio.mux_total = 1;
     b->pins[14].gpio.mux[0].pin = 37;
@@ -182,7 +200,7 @@ maa_intel_galileo_rev_d()
     b->pins[14].aio.mux[0].value = 0;
 
     strncpy(b->pins[15].name, "A1", 8);
-    b->pins[15].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,0,1};
+    b->pins[15].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,0,1};
     b->pins[15].gpio.pinmap = 45;
     b->pins[15].gpio.mux_total = 1;
     b->pins[15].gpio.mux[0].pin = 36;
@@ -193,7 +211,7 @@ maa_intel_galileo_rev_d()
     b->pins[15].aio.mux[0].value = 0;
 
     strncpy(b->pins[16].name, "A2", 8);
-    b->pins[16].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,0,1};
+    b->pins[16].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,0,1};
     b->pins[16].gpio.pinmap = 46;
     b->pins[16].gpio.mux_total = 1;
     b->pins[16].gpio.mux[0].pin = 23;
@@ -204,7 +222,7 @@ maa_intel_galileo_rev_d()
     b->pins[16].aio.mux[0].value = 0;
 
     strncpy(b->pins[17].name, "A3", 8);
-    b->pins[17].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,0,1};
+    b->pins[17].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,0,1};
     b->pins[17].gpio.pinmap = 47;
     b->pins[17].gpio.mux_total = 1;
     b->pins[17].gpio.mux[0].pin = 22;
@@ -215,7 +233,7 @@ maa_intel_galileo_rev_d()
     b->pins[17].aio.mux[0].value = 0;
 
     strncpy(b->pins[18].name, "A4", 8);
-    b->pins[18].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,1,1};
+    b->pins[18].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,1,1};
     b->pins[18].gpio.pinmap = 48;
     b->pins[18].gpio.mux_total = 2;
     b->pins[18].gpio.mux[0].pin = 29;
@@ -234,7 +252,7 @@ maa_intel_galileo_rev_d()
     b->pins[18].aio.mux[1].value = 0;
 
     strncpy(b->pins[19].name, "A5", 8);
-    b->pins[19].capabilites = (maa_pincapabilities_t) {1,1,0,0,0,1,1};
+    b->pins[19].capabilites = (mraa_pincapabilities_t) {1,1,0,0,0,1,1};
     b->pins[19].gpio.pinmap = 49;
     b->pins[19].gpio.mux_total = 2;
     b->pins[19].gpio.mux[0].pin = 29;
@@ -256,12 +274,13 @@ maa_intel_galileo_rev_d()
     b->i2c_bus_count = 1;
     b->def_i2c_bus = 0;
     b->i2c_bus[0].bus_id = 0;
-    b->i2c_bus[0].sda = 17;
-    b->i2c_bus[0].scl = 18;
+    b->i2c_bus[0].sda = 18;
+    b->i2c_bus[0].scl = 19;
 
     b->spi_bus_count = 1;
     b->def_spi_bus = 0;
     b->spi_bus[0].bus_id = 1;
+    b->spi_bus[0].slave_s = 0;
     b->spi_bus[0].cs = 10;
     b->spi_bus[0].mosi = 11;
     b->spi_bus[0].miso = 12;