From 08c64f776ebdeb675ef4e146dd2c487ebfbb60a0 Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Mon, 13 Apr 2009 12:45:46 -0400 Subject: [PATCH] didn't actually do the last step. fixed. --- doc/ws.dis | 4 ++-- src/maca.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/ws.dis b/doc/ws.dis index 9088ac9a7..5be0bc013 100644 --- a/doc/ws.dis +++ b/doc/ws.dis @@ -5309,7 +5309,7 @@ Disassembly of section P2: 4030e8: 00ffffff .word 0x00ffffff 004030ec : - 4030ec: b430 push {r4, r5} //r0 = chan_num r1=vcodivF r2=vcodivI + 4030ec: b430 push {r4, r5} //r0 = chan_num r1=vcodivI r2=vcodivF 4030ee: 4b1d ldr r3, [pc, #116] (403164 ) 4030f0: 681c ldr r4, [r3, #0] //r4 = *0x80009800 4030f2: 4d1d ldr r5, [pc, #116] (403168 ) //0xbfffffff @@ -6370,7 +6370,7 @@ Disassembly of section P2: 403a3c: 4a03 ldr r2, [pc, #12] (403a4c ) r2=0x00403c14 (gaRFSynVCODivF_c) 403a3e: 5852 ldr r2, [r2, r1] r2 gets gaRFSynVCODivF_c[r1] 403a40: 4903 ldr r1, [pc, #12] (403a50 ) r1=0x00403c04 (gaRFSynVCODivI_c) - 403a42: 5c09 ldrb r1, [r1, r0] r1 gets gaRFSynVCODivI_c[r1] + 403a42: 5c09 ldrb r1, [r1, r0] r1 gets gaRFSynVCODivI_c[r0] 403a44: f7ff fb52 bl 4030ec // SetChannel(chan,gaRFSynVCODivI_c[chan],gaRFSynVCODivF_c[chan]) 403a48: 2000 movs r0, #0 403a4a: e01d b.n 403a88 diff --git a/src/maca.c b/src/maca.c index eb5e24f4e..cd27d2b7f 100644 --- a/src/maca.c +++ b/src/maca.c @@ -338,7 +338,7 @@ void set_channel(uint8_t chan) { reg(ADDR_CHAN4) = tmp; tmp = tmp & 0xffffe0ff; - tmp | ((ctov_4c[chan]<<8)&0x1F00); + tmp = tmp | (((ctov_4c[chan])<<8)&0x1F00); reg(ADDR_CHAN4) = tmp; /* duh! */ }