diff options
Diffstat (limited to 'firmware/target/arm/as3525/debug-as3525.c')
-rw-r--r-- | firmware/target/arm/as3525/debug-as3525.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c index ac7253d579..ea1bf9c381 100644 --- a/firmware/target/arm/as3525/debug-as3525.c +++ b/firmware/target/arm/as3525/debug-as3525.c | |||
@@ -120,39 +120,39 @@ int calc_freq(int clk) | |||
120 | switch(CGU_PROC & 3) { | 120 | switch(CGU_PROC & 3) { |
121 | case 0: | 121 | case 0: |
122 | return CLK_MAIN/ | 122 | return CLK_MAIN/ |
123 | ((8/(8-((CGU_PROC & 0xc)>>2)))*(((CGU_PROC & 0xf0)>>4) + 1)); | 123 | ((8/(8-((CGU_PROC>>2)& 0x3)))*(((CGU_PROC>>4)& 0xf) + 1)); |
124 | case 1: | 124 | case 1: |
125 | return calc_freq(CLK_PLLA)/ | 125 | return calc_freq(CLK_PLLA)/ |
126 | ((8/(8-((CGU_PROC & 0xc)>>2)))*(((CGU_PROC & 0xf0)>>4) + 1)); | 126 | ((8/(8-((CGU_PROC>>2)& 0x3)))*(((CGU_PROC>>4)& 0xf) + 1)); |
127 | case 2: | 127 | case 2: |
128 | return calc_freq(CLK_PLLB)/ | 128 | return calc_freq(CLK_PLLB)/ |
129 | ((8/(8-((CGU_PROC & 0xc)>>2)))*(((CGU_PROC & 0xf0)>>4) + 1)); | 129 | ((8/(8-((CGU_PROC>>2)& 0x3)))*(((CGU_PROC>>4)& 0xf) + 1)); |
130 | default: | 130 | default: |
131 | return 0; | 131 | return 0; |
132 | } | 132 | } |
133 | case CLK_EXTMEM: | 133 | case CLK_EXTMEM: |
134 | switch(CGU_PERI & 3) { | 134 | switch(CGU_PERI & 3) { |
135 | case 0: | 135 | case 0: |
136 | return CLK_MAIN/(((CGU_PERI & 0x3c)>>2)+1); | 136 | return CLK_MAIN/(((CGU_PERI>>2)& 0xf)+1); |
137 | case 1: | 137 | case 1: |
138 | return calc_freq(CLK_PLLA)/(((CGU_PERI & 0x3c)>>2)+1); | 138 | return calc_freq(CLK_PLLA)/(((CGU_PERI>>2)& 0xf)+1); |
139 | case 2: | 139 | case 2: |
140 | return calc_freq(CLK_PLLB)/(((CGU_PERI & 0x3c)>>2)+1); | 140 | return calc_freq(CLK_PLLB)/(((CGU_PERI>>2)& 0xf)+1); |
141 | case 3: | 141 | case 3: |
142 | return calc_freq(CLK_FCLK)/(((CGU_PERI & 0x3c)>>2)+1); | 142 | return calc_freq(CLK_FCLK)/(((CGU_PERI>>2)& 0xf)+1); |
143 | default: | 143 | default: |
144 | return 0; | 144 | return 0; |
145 | } | 145 | } |
146 | case CLK_PCLK: | 146 | case CLK_PCLK: |
147 | return calc_freq(CLK_EXTMEM)/(((CGU_PERI & 0x40)>>6)+1); | 147 | return calc_freq(CLK_EXTMEM)/(((CGU_PERI>>6)& 0x1)+1); |
148 | case CLK_IDE: | 148 | case CLK_IDE: |
149 | switch(CGU_IDE & 3) { | 149 | switch(CGU_IDE & 3) { |
150 | case 0: | 150 | case 0: |
151 | return CLK_MAIN/(((CGU_IDE & 0x3c)>>2)+1); | 151 | return CLK_MAIN/(((CGU_IDE>>2)& 0xf)+1); |
152 | case 1: | 152 | case 1: |
153 | return calc_freq(CLK_PLLA)/(((CGU_IDE & 0x3c)>>2)+1);; | 153 | return calc_freq(CLK_PLLA)/(((CGU_IDE>>2)& 0xf)+1); |
154 | case 2: | 154 | case 2: |
155 | return calc_freq(CLK_PLLB)/(((CGU_IDE & 0x3c)>>2)+1); | 155 | return calc_freq(CLK_PLLB)/(((CGU_IDE>>2)& 0xf)+1); |
156 | default: | 156 | default: |
157 | return 0; | 157 | return 0; |
158 | } | 158 | } |