diff options
Diffstat (limited to 'utils/hwstub')
-rw-r--r-- | utils/hwstub/tools/lua/fiiox1.lua | 3 | ||||
-rw-r--r-- | utils/hwstub/tools/lua/jz/gpio.lua | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/utils/hwstub/tools/lua/fiiox1.lua b/utils/hwstub/tools/lua/fiiox1.lua index c038f4077b..4453951c29 100644 --- a/utils/hwstub/tools/lua/fiiox1.lua +++ b/utils/hwstub/tools/lua/fiiox1.lua | |||
@@ -92,7 +92,7 @@ function FIIOX1.init_lcd() | |||
92 | -- setup Fiio X1 specific pins | 92 | -- setup Fiio X1 specific pins |
93 | FIIOX1.setup_fiio_lcd_pins() | 93 | FIIOX1.setup_fiio_lcd_pins() |
94 | -- reset lcd | 94 | -- reset lcd |
95 | JZ.lcd_reset() | 95 | FIIOX1.lcd_reset() |
96 | end | 96 | end |
97 | 97 | ||
98 | -- call with nil to get automatic name | 98 | -- call with nil to get automatic name |
@@ -139,6 +139,7 @@ function FIIOX1.dump_spl(file) | |||
139 | end | 139 | end |
140 | 140 | ||
141 | function FIIOX1.init() | 141 | function FIIOX1.init() |
142 | FIIOX1.hw_detect() | ||
142 | FIIOX1.init_backligt() | 143 | FIIOX1.init_backligt() |
143 | FIIOX1.test_backlight() | 144 | FIIOX1.test_backlight() |
144 | FIIOX1.init_lcd() | 145 | FIIOX1.init_lcd() |
diff --git a/utils/hwstub/tools/lua/jz/gpio.lua b/utils/hwstub/tools/lua/jz/gpio.lua index d85529f9bb..d411de6acf 100644 --- a/utils/hwstub/tools/lua/jz/gpio.lua +++ b/utils/hwstub/tools/lua/jz/gpio.lua | |||
@@ -23,8 +23,8 @@ function JZ.gpio.pinmask(bank, mask) | |||
23 | end | 23 | end |
24 | 24 | ||
25 | t.gpio = function() | 25 | t.gpio = function() |
26 | HW.GPIO.FUN[bank].CLR.write(mask) | 26 | HW.GPIO.FUNCTION[bank].CLR.write(mask) |
27 | HW.GPIO.SEL[bank].CLR.write(mask) | 27 | HW.GPIO.SELECT[bank].CLR.write(mask) |
28 | end | 28 | end |
29 | 29 | ||
30 | t.dir = function(out) | 30 | t.dir = function(out) |
@@ -56,17 +56,17 @@ function JZ.gpio.pinmask(bank, mask) | |||
56 | end | 56 | end |
57 | 57 | ||
58 | t.std_function = function(fun_nr) | 58 | t.std_function = function(fun_nr) |
59 | HW.GPIO.FUN[bank].SET.write(mask) | 59 | HW.GPIO.FUNCTION[bank].SET.write(mask) |
60 | if fun_nr >= 2 then | 60 | if fun_nr >= 2 then |
61 | HW.GPIO.TRG[bank].SET.write(mask) | 61 | HW.GPIO.TRIGGER[bank].SET.write(mask) |
62 | fun_nr = fun_nr - 2 | 62 | fun_nr = fun_nr - 2 |
63 | else | 63 | else |
64 | HW.GPIO.TRG[bank].CLR.write(mask) | 64 | HW.GPIO.TRIGGER[bank].CLR.write(mask) |
65 | end | 65 | end |
66 | if fun_nr >= 2 then | 66 | if fun_nr >= 2 then |
67 | HW.GPIO.SEL[bank].SET.write(mask) | 67 | HW.GPIO.SELECT[bank].SET.write(mask) |
68 | else | 68 | else |
69 | HW.GPIO.SEL[bank].CLR.write(mask) | 69 | HW.GPIO.SELECT[bank].CLR.write(mask) |
70 | end | 70 | end |
71 | end | 71 | end |
72 | return t | 72 | return t |
@@ -79,4 +79,4 @@ function JZ.gpio.pin(bank,pin) | |||
79 | return bit32.extract(HW.GPIO.IN[bank].read(), pin) | 79 | return bit32.extract(HW.GPIO.IN[bank].read(), pin) |
80 | end | 80 | end |
81 | return t | 81 | return t |
82 | end \ No newline at end of file | 82 | end |