summaryrefslogtreecommitdiff
path: root/firmware/target/arm/imx233
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/imx233')
-rw-r--r--firmware/target/arm/imx233/button-lradc-imx233.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/firmware/target/arm/imx233/button-lradc-imx233.c b/firmware/target/arm/imx233/button-lradc-imx233.c
index 66d42a47dc..36c1344542 100644
--- a/firmware/target/arm/imx233/button-lradc-imx233.c
+++ b/firmware/target/arm/imx233/button-lradc-imx233.c
@@ -65,7 +65,7 @@ static int button_find(int val)
65 btn = table[0].btn; 65 btn = table[0].btn;
66 else if(i == table_size) 66 else if(i == table_size)
67 btn = table[i - 1].btn; 67 btn = table[i - 1].btn;
68 // choose best between i-1 and i (note that table[i-1]<=val<=table[i]) */ 68 // choose best between i-1 and i (note that table[i-1]<=val<table[i]) */
69 else if(val - table[i - 1].adc_val < table[i].adc_val - val) 69 else if(val - table[i - 1].adc_val < table[i].adc_val - val)
70 btn = table[i - 1].btn; 70 btn = table[i - 1].btn;
71 else 71 else
@@ -73,8 +73,6 @@ static int button_find(int val)
73 return btn; 73 return btn;
74} 74}
75 75
76int button_value;
77
78static void button_lradc_irq(int chan) 76static void button_lradc_irq(int chan)
79{ 77{
80 (void) chan; 78 (void) chan;
@@ -84,7 +82,6 @@ static void button_lradc_irq(int chan)
84 imx233_lradc_setup_channel(button_chan, true, true, SAMPLES - 1, LRADC_SRC(CHAN)); 82 imx233_lradc_setup_channel(button_chan, true, true, SAMPLES - 1, LRADC_SRC(CHAN));
85 imx233_lradc_setup_delay(button_delay, 1 << button_chan, 0, SAMPLES - 1, DELAY); 83 imx233_lradc_setup_delay(button_delay, 1 << button_chan, 0, SAMPLES - 1, DELAY);
86 imx233_lradc_kick_delay(button_delay); 84 imx233_lradc_kick_delay(button_delay);
87 button_value = button_val[button_idx];
88 /* compute mask, compare to previous one */ 85 /* compute mask, compare to previous one */
89 button_val[button_idx] = button_find(button_val[button_idx]); 86 button_val[button_idx] = button_find(button_val[button_idx]);
90 button_idx = 1 - button_idx; 87 button_idx = 1 - button_idx;
@@ -94,6 +91,10 @@ static void button_lradc_irq(int chan)
94 91
95void imx233_button_lradc_init(void) 92void imx233_button_lradc_init(void)
96{ 93{
94 table_size = 0;
95 while(imx233_button_lradc_mapping[table_size].btn != IMX233_BUTTON_LRADC_END)
96 table_size++;
97
97 button_chan = imx233_lradc_acquire_channel(LRADC_SRC(CHAN), TIMEOUT_NOBLOCK); 98 button_chan = imx233_lradc_acquire_channel(LRADC_SRC(CHAN), TIMEOUT_NOBLOCK);
98 if(button_chan < 0) 99 if(button_chan < 0)
99 panicf("Cannot get channel for button-lradc"); 100 panicf("Cannot get channel for button-lradc");
@@ -105,10 +106,6 @@ void imx233_button_lradc_init(void)
105 imx233_lradc_enable_channel_irq(button_chan, true); 106 imx233_lradc_enable_channel_irq(button_chan, true);
106 imx233_lradc_set_channel_irq_callback(button_chan, button_lradc_irq); 107 imx233_lradc_set_channel_irq_callback(button_chan, button_lradc_irq);
107 imx233_lradc_kick_delay(button_delay); 108 imx233_lradc_kick_delay(button_delay);
108
109 table_size = 0;
110 while(imx233_button_lradc_mapping[table_size].btn != IMX233_BUTTON_LRADC_END)
111 table_size++;
112} 109}
113 110
114bool imx233_button_lradc_hold(void) 111bool imx233_button_lradc_hold(void)