X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_mma655x.c;h=e8eeea6e4b6dc8d424a9bf242ab60b706fbe399e;hb=49ce3e9a2eb4e1918773b80c355d720a3dadc7e0;hp=c36858add00bd4eb83711665b233d43111857486;hpb=2a912dcde191e2f750845c464611641a5abdc28a;p=fw%2Faltos

diff --git a/src/drivers/ao_mma655x.c b/src/drivers/ao_mma655x.c
index c36858ad..e8eeea6e 100644
--- a/src/drivers/ao_mma655x.c
+++ b/src/drivers/ao_mma655x.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,13 +30,10 @@
 #define PRINTD(l,...) 
 #endif
 
-uint8_t	ao_mma655x_spi_index = AO_MMA655X_SPI_INDEX;
-
 static void
 ao_mma655x_start(void) {
 	ao_spi_get_bit(AO_MMA655X_CS_PORT,
 		       AO_MMA655X_CS_PIN,
-		       AO_MMA655X_CS,
 		       AO_MMA655X_SPI_INDEX,
 		       AO_SPI_SPEED_FAST);
 }
@@ -44,19 +42,18 @@ static void
 ao_mma655x_stop(void) {
 	ao_spi_put_bit(AO_MMA655X_CS_PORT,
 		       AO_MMA655X_CS_PIN,
-		       AO_MMA655X_CS,
 		       AO_MMA655X_SPI_INDEX);
 }
 
 static void
 ao_mma655x_restart(void) {
 	uint8_t	i;
-	ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, AO_MMA655X_CS, 1);
+	ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, 1);
 
 	/* Emperical testing on STM32L151 at 32MHz for this delay amount */
 	for (i = 0; i < 10; i++)
 		ao_arch_nop();
-	ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, AO_MMA655X_CS, 0);
+	ao_gpio_set(AO_MMA655X_CS_PORT, AO_MMA655X_CS_PIN, 0);
 }
 
 static uint8_t
@@ -260,7 +257,7 @@ ao_mma655x_dump(void)
 	printf ("MMA655X value %d\n", ao_mma655x_current);
 }
 
-__code struct ao_cmds ao_mma655x_cmds[] = {
+const struct ao_cmds ao_mma655x_cmds[] = {
 	{ ao_mma655x_dump,	"A\0Display MMA655X data" },
 	{ 0, NULL },
 };
@@ -278,7 +275,7 @@ ao_mma655x(void)
 	}
 }
 
-static __xdata struct ao_task ao_mma655x_task;
+static struct ao_task ao_mma655x_task;
 
 void
 ao_mma655x_init(void)