rendered paste bodydiff -u -r1.1 regs_asic3.py
--- haretconsole/regs_asic3.py 13 Dec 2007 23:17:34 -0000 1.1
+++ haretconsole/regs_asic3.py 15 Dec 2007 22:29:46 -0000
@@ -98,9 +98,10 @@
# FIXME: add SD banks (SD_CONFIG, SD_CTRL, SDIO_CTRL)
-def getASIC3Defs(base, sd_base):
+def getASIC3Defs(base, sd_base, shift=0):
out = {}
for bank, btuple in ASIC3_BANK.items():
for offset, function in btuple[1].items():
- out[base+bank+offset] = btuple[0] + "_" + function
+ name = btuple[0] + "_" + function
+ out[base + (bank+offset)>>shift] = name
return out
Index: haretconsole/regs_misc.py
===================================================================
RCS file: /cvs/haret/haretconsole/regs_misc.py,v
retrieving revision 1.4
diff -u -r1.4 regs_misc.py
--- haretconsole/regs_misc.py 13 Dec 2007 23:24:50 -0000 1.4
+++ haretconsole/regs_misc.py 15 Dec 2007 22:29:46 -0000
@@ -49,7 +49,8 @@
# HTC Roadster (HP iPAQ hx4700) specific registers
Regs_HX4700 = regs_pxa.Regs_pxa27x.copy()
Regs_HX4700.update(getEGPIOdefs(0x14000000, 1))
-Regs_HX4700.update(regs_asic3.getASIC3Defs(base=0x0c000000, sd_base=0x0e000000))
+Regs_HX4700.update(regs_asic3.getASIC3Defs(base=0x0c000000, sd_base=0x0e000000
+ , shift=1))
Regs_HX4700.update(regs_ati.getWxxxxDefs(0x08000000))
memalias.RegsList['HX4700'] = Regs_HX4700
@@ -63,5 +64,6 @@
# HTC Universal specific registers
Regs_Universal = regs_pxa.Regs_pxa27x.copy()
Regs_Universal.update(getEGPIOdefs(0x0a000000, 1))
-Regs_Universal.update(regs_asic3.getASIC3Defs(base=0x10000000, sd_base=0x0c000000))
+Regs_Universal.update(regs_asic3.getASIC3Defs(base=0x10000000, sd_base=0x0c000000
+ , shift=1))
memalias.RegsList['Universal'] = Regs_Universal