i.MX31/Gigabeat S minor cleaning: Make HW access more obvious in places I forgot to do earlier. Reduce the number of structs that need to be filled-out for some drivers just to simplify a little. Change some types.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25870 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 7 deletions

diff --git a/firmware/target/arm/imx31/mc13783-imx31.c b/firmware/target/arm/imx31/mc13783-imx31.c
index 5146122327..9d8f6190a3 100644
--- a/firmware/target/arm/imx31/mc13783-imx31.c
+++ b/firmware/target/arm/imx31/mc13783-imx31.c
@@ -22,10 +22,11 @@
 #include "cpu.h"
 #include "gpio-imx31.h"
 #include "mc13783.h"
+#include "mc13783-target.h"
 #include "debug.h"
 #include "kernel.h"
 
-extern const struct mc13783_event_list mc13783_event_list;
+extern const struct mc13783_event mc13783_events[MC13783_NUM_EVENTS];
 extern struct spi_node mc13783_spi;
 
 /* PMIC event service data */
@@ -107,8 +108,8 @@ static void mc13783_interrupt_thread(void)
          * generated. */
         imx31_regset32(&MC13783_GPIO_IMR, 1ul << MC13783_GPIO_LINE);
 
-        event = mc13783_event_list.events;
-        event_last = event + mc13783_event_list.count;
+        event = mc13783_events;
+        event_last = event + MC13783_NUM_EVENTS;
 
         /* .count is surely expected to be > 0 */
         do
@@ -181,8 +182,7 @@ void mc13783_close(void)
 
 bool mc13783_enable_event(enum mc13783_event_ids id)
 {
-    const struct mc13783_event * const event =
-        &mc13783_event_list.events[id];
+    const struct mc13783_event * const event = &mc13783_events[id];
     int set = event->set;
     uint32_t mask = event->mask;
 
@@ -198,8 +198,7 @@ bool mc13783_enable_event(enum mc13783_event_ids id)
 
 void mc13783_disable_event(enum mc13783_event_ids id)
 {
-    const struct mc13783_event * const event =
-        &mc13783_event_list.events[id];
+    const struct mc13783_event * const event = &mc13783_events[id];
     int set = event->set;
     uint32_t mask = event->mask;