diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2012-01-02 18:32:35 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2012-01-02 18:32:35 +0000 |
commit | 5a8da163c842b08c6dbf1df6921507ec2fd5a534 (patch) | |
tree | 559e1704efa126f603411fd71abd99a01c0e6610 /firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c | |
parent | 1f0e6530386e2295d9573f3f9cb7fd75f2e87450 (diff) | |
download | rockbox-5a8da163c842b08c6dbf1df6921507ec2fd5a534.tar.gz rockbox-5a8da163c842b08c6dbf1df6921507ec2fd5a534.zip |
i.MX31 - Dethreading operations continue
Dispense with "pmic" thread and process PMIC events directly within ISR. Add
sense bit reading as part of the handling.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31528 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c index 12009fae06..6ae8c23c48 100644 --- a/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c | |||
@@ -55,28 +55,33 @@ const struct mc13783_event mc13783_events[MC13783_NUM_EVENTS] = | |||
55 | { | 55 | { |
56 | [MC13783_ADCDONE_EVENT] = /* ADC conversion complete */ | 56 | [MC13783_ADCDONE_EVENT] = /* ADC conversion complete */ |
57 | { | 57 | { |
58 | .int_id = MC13783_INT_ID_ADCDONE, | 58 | .int_id = MC13783_INT_ID_ADCDONE, |
59 | .sense = 0, | ||
59 | .callback = adc_done, | 60 | .callback = adc_done, |
60 | }, | 61 | }, |
61 | [MC13783_ONOFD1_EVENT] = /* Power button */ | 62 | [MC13783_ONOFD1_EVENT] = /* Power button */ |
62 | { | 63 | { |
63 | .int_id = MC13783_INT_ID_ONOFD1, | 64 | .int_id = MC13783_INT_ID_ONOFD1, |
65 | .sense = MC13783_ONOFD1S, | ||
64 | .callback = button_power_event, | 66 | .callback = button_power_event, |
65 | }, | 67 | }, |
66 | [MC13783_SE1_EVENT] = /* Main charger detection */ | 68 | [MC13783_SE1_EVENT] = /* Main charger detection */ |
67 | { | 69 | { |
68 | .int_id = MC13783_INT_ID_SE1, | 70 | .int_id = MC13783_INT_ID_SE1, |
71 | .sense = MC13783_SE1S, | ||
69 | .callback = charger_main_detect_event, | 72 | .callback = charger_main_detect_event, |
70 | }, | 73 | }, |
71 | [MC13783_USB_EVENT] = /* USB insertion/USB charger detection */ | 74 | [MC13783_USB_EVENT] = /* USB insertion/USB charger detection */ |
72 | { | 75 | { |
73 | .int_id = MC13783_INT_ID_USB, | 76 | .int_id = MC13783_INT_ID_USB, |
77 | .sense = MC13783_USB4V4S, | ||
74 | .callback = usb_connect_event, | 78 | .callback = usb_connect_event, |
75 | }, | 79 | }, |
76 | #ifdef HAVE_HEADPHONE_DETECTION | 80 | #ifdef HAVE_HEADPHONE_DETECTION |
77 | [MC13783_ONOFD2_EVENT] = /* Headphone jack */ | 81 | [MC13783_ONOFD2_EVENT] = /* Headphone jack */ |
78 | { | 82 | { |
79 | .int_id = MC13783_INT_ID_ONOFD2, | 83 | .int_id = MC13783_INT_ID_ONOFD2, |
84 | .sense = 0, | ||
80 | .callback = headphone_detect_event, | 85 | .callback = headphone_detect_event, |
81 | }, | 86 | }, |
82 | #endif | 87 | #endif |