OSDN Git Service

[Doc] GITLOG to v1.0beta1.1.
[openi2cradio/OpenI2CRadio.git] / akc6955.c
index 4d6dabf..181cea9 100644 (file)
--- a/akc6955.c
+++ b/akc6955.c
 
 #include <stdarg.h>
 #include <stdio.h>
+#ifdef __SDCC
 #include <delay.h>
+#else
+#include <xc.h>
+#endif
 #include <string.h>
 #include "akc6955.h"
 #include "i2c_io.h"
 #include "idle.h"
+#include "power.h"
+#include "commondef.h"
+#include "menu.h"
+
+
+void akc6955_chg_fm(unsigned char f, unsigned int freq)
+{
+    __bitops_t b;
+    b.byte = akc6955_readcmd(AKC6955_POWER);
+    b.b6 = 0;
+    if(f != 0){
+        b.b6 = 1;
+        akc6955_set_fmband(setup.fmband);
+        akc6955_writecmd(AKC6955_POWER, b.byte);
+        akc6955_set_freq(freq);
+        return;
+    }
+    akc6955_writecmd(AKC6955_POWER, b.byte);
+    akc6955_set_amband(setup.amband);
+    akc6955_set_freq(freq);
 
-
-void akc6955_writecmd(unsigned char reg, unsigned char data)
-{
-    i2c_idle();
-    OPENASMASTER();
-    i2c_writechar(AKC6955_ADDRESS);
-    i2c_writechar(reg);
-    i2c_writechar(data);
-    CLOSEASMASTER();
-}
-
-unsigned char akc6955_readcmd(unsigned char reg)
-{
-    unsigned char c;
-    i2c_idle();
-    OPENASMASTER();
-    i2c_writechar(AKC6955_ADDRESS);
-    i2c_writechar(reg);
-    c = i2c_readchar();
-    CLOSEASMASTER();
-    return c;
 }
 
-
-void akc6955_chg_fm(unsigned char fm)
+unsigned char akc6955_get_fm(void)
 {
-    unsigned char b;
-    b = akc6955_readcmd(AKC6955_POWER);
-    if(fm != 0){
-        b |= 0x40;
-    } else {
-        b &= 0xbf;
+    __bitops_t b;
+    b.byte = akc6955_readcmd(AKC6955_POWER);
+    if(b.b6){
+        return 0xff;
     }
-    akc6955_writecmd(AKC6955_POWER, b);
+    return 0;
 }
 
+
 void akc6955_set_amband(unsigned char band)
 {
     unsigned char b;
+    unsigned char c;
+
+    c = RFAMP_SW;
+    if((band < AKC6955_BAND_SW1) || (band == AKC6955_BAND_MW4)) {
+        c = RFAMP_MWLW;
+    }
+    rfamp_power(c);
     b = akc6955_readcmd(AKC6955_BAND);
     b &= 0x07; // extract FM
     b = b | ((band & 0x1f) << 3);
     akc6955_writecmd(AKC6955_BAND, b);
+    akc6955_do_tune();
 }
 
 void akc6955_set_fmband(unsigned char band)
 {
     unsigned char b;
+    rfamp_power(RFAMP_FM);
     b = akc6955_readcmd(AKC6955_BAND);
     b &= 0xf8; // extract AM
     b = b | (band & 0x07);
     akc6955_writecmd(AKC6955_BAND, b);
+    akc6955_do_tune();
 }
 
-unsigned char akc6955_get_amband(void)
+unsigned char akc6955_get_band(void)
 {
-    unsigned char b;
-    b = akc6955_readcmd(AKC6955_BAND);
-    b = (b & 0xf8) >> 3;
-    return b;
+    return akc6955_readcmd(AKC6955_BAND);
 }
 
-unsigned char akc6955_get_fmband(void)
-{
-    unsigned char b;
-    b = akc6955_readcmd(AKC6955_BAND);
-    b = b & 0x07;
-    return b;
-}
 
 void akc6955_set_power(unsigned char on)
 {
-    unsigned char b;
-    b = akc6955_readcmd(AKC6955_POWER);
+    __bitops_t b;
+    b.byte = akc6955_readcmd(AKC6955_POWER);
+    b.b7 = 0;
     if(on != 0){
-        b |= 0x80;
-    } else {
-        b &= 0x7f;
+        b.b7 = 1;
     }
-    akc6955_writecmd(AKC6955_POWER, b);
+    akc6955_writecmd(AKC6955_POWER, b.byte);
 }
 
 void akc6955_do_tune(void)
 {
-    unsigned char b;
-    b = akc6955_readcmd(AKC6955_POWER);
-    b &= 0xdf; // Tun = '0'
-    akc6955_writecmd(AKC6955_POWER, b);
-    // Need sleep?
-    b |= 0x20; // Tun = '1'
-    akc6955_writecmd(AKC6955_POWER, b);
+    __bitops_t b;
+    b.byte = akc6955_readcmd(AKC6955_POWER);
+    b.b5 = 0; // Tun = '0'
+    b.b4 = 0; // Force abort scan.
+    akc6955_writecmd(AKC6955_POWER, b.byte);
+    idle_time_ms(1);
+    // Need sleep?-> Need! this sequence re                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 fer from reference code.
+    b.b5= 1; // Tun = '1'
+    akc6955_writecmd(AKC6955_POWER, b.byte);
+    idle_time_ms(1);
+    b.b5 = 0;
+    akc6955_writecmd(AKC6955_POWER, b.byte);
+    idle_time_ms(8);
 }
 
 unsigned char akc6955_tune(void)
 {
-    unsigned char b;
-    b = akc6955_readcmd(AKC6955_RCH_HI) & 0x20;
-    if(b == 0x00) {
-        return 0;
-    } else {
+    __bitops_t b;
+    b.byte = akc6955_readcmd(AKC6955_RCH_HI);
+    if(b.b5) {
         return 0xff;
     }
+    return 0;
 }
 
 
-unsigned int akc6955_mode3k(unsigned char flag)
+void akc6955_mode3k(unsigned char flag)
 {
-    unsigned char b;
-    b = akc6955_readcmd(AKC6955_CH_HI);
+    __bitops_t b;
+    b.byte = akc6955_readcmd(AKC6955_CH_HI);
+    b.b5 = 0;
     if(flag != 0){
-        b |= 0x20;
-    } else {
-        b &= 0xdf;
+        b.b5 = 1;
     }
-    akc6955_writecmd(AKC6955_CH_HI, b);
-//    akc6955_do_tune();
+    akc6955_writecmd(AKC6955_CH_HI, b.byte);
+    akc6955_do_tune();
     _AKC6955_WAIT_62_5MS();
-    return akc6955_get_freq();
 }
 
 void akc6955_set_tune(unsigned char mode_3k, unsigned int ch)
 {
     unsigned char band;
-    unsigned char fm;
-    unsigned char b;
-    unsigned int i;
-    unsigned int mod;
-
-    fm = akc6955_readcmd(AKC6955_POWER) & 0x40;
-    if(fm == 0){
-        // AM
-        band = akc6955_get_amband();
-    } else {
-        band = 0;
+    __bitops_t f;
+    __bitops_t b;
+    unsigned int i = ch;
+    unsigned char comp;
+
+    do { // Wait for before completed
+        comp = akc6955_chk_donescan();
+        idle_time_35ms();
+    } while(comp == 0x00);
+    f.byte = akc6955_readcmd(AKC6955_POWER);
+    band = 0;
+    if(!f.b6){
+        akc6955_get_amband(band);
     }
-    if(band == 2){
+
+    if(band == AKC6955_BAND_MW2){
         // BAND=AM && MW2
-        i = i / 3; // On MW2, Channnel must be multiple of 3.
-        i = (i << 1) + i; // i = (i/3) * 3
+        i = ch / 3; // On MW2, Channnel must be multiple of 3.
+        i = i * 3; // i = (i/3) * 3
     }
     if(i > 0x1fff) i = 0x1fff;
     //i = ch & 0x1fff;
 
-    if(mode_3k == 0){
-        b = ((i >> 8) & 0x1f) | 0x40; // 32.768KHz clock
-    } else {
-        b = ((i >> 8) & 0x1f) | 0x60;
+    b.byte = i & 0xff;
+    akc6955_writecmd(AKC6955_CH_LO, b.byte);
+
+    b.byte = i >> 8;
+    b.b6 = 1;
+    if(mode_3k != 0){
+        b.b5 = 1; // Mode 3K ON
     }
-    akc6955_writecmd(AKC6955_CH_HI, b);
-    b = i & 0xff;
-    akc6955_writecmd(AKC6955_CH_LO, b);
+    akc6955_writecmd(AKC6955_CH_HI, b.byte);
+
     akc6955_do_tune();
-    do{
-        // Use software-delay, but recommands hardware-delay ;-(
-        //_AKC6955_WAIT_12_5MS();
-        idle(65535 - 100 + 1); // 0.128 * 100 = 12.8ms
-    } while(akc6955_tune() == 0);
 }
 
 void akc6955_do_scan(unsigned char up)
 {
-    unsigned char b;
-    akc6955_do_tune();
-    b = akc6955_readcmd(AKC6955_POWER);
-    b &= 0xe3;
+    __bitops_t b;
+ //   akc6955_do_tune();
+    b.byte = akc6955_readcmd(AKC6955_POWER);
+    b.b3 = 0;
+    b.b4 = 0;
+    b.b5 = 0;
+    akc6955_writecmd(AKC6955_POWER, b.byte);
+    b.b5 = 1; // Tune 0->1.
+    idle_time_35ms();
+    akc6955_writecmd(AKC6955_POWER, b.byte);
+    idle_time_35ms();
     if(up != 0) {
-        b |= 0x08;
+        b.b3= 1;
     }
-    akc6955_writecmd(AKC6955_POWER, b); // Falldown seek bit to '0'.
-    b |= 0x10;
-    akc6955_writecmd(AKC6955_POWER, b); // Raise seek bit to '1'.
+    b.b4 = 1;
+    akc6955_writecmd(AKC6955_POWER, b.byte); // Raise seek bit to '1'.
 }
 
 void akc6955_abort_scan(void)
@@ -225,38 +234,45 @@ void akc6955_set_scanrate_fm(unsigned char rate)
 
 unsigned char akc6955_chk_donescan(void)
 {
-    unsigned char b;
-    b = akc6955_readcmd(AKC6955_RCH_HI) & 0x40;
-    if(b == 0) return 0;
-    return 0xff;
+    __bitops_t b;
+    b.byte = akc6955_readcmd(AKC6955_RCH_HI);
+    if(b.b6){
+        return 0xff;
+    }
+    return 0;
 }
 
+unsigned int akc6955_get_channel(void)
+{
+    unsigned char h, l;
+    unsigned int u;
+    l = akc6955_readcmd(AKC6955_RCH_LO) ;
+    h = akc6955_readcmd(AKC6955_RCH_HI) & 0x1f;
+    u = (h << 8) | l;
+    return u;
+}
 
 /*
  * Get AM/FM Frequency: ret = KHz at AM, 10KHz @FM.
  */
 unsigned int akc6955_get_freq(void)
 {
-    unsigned char b, h, l;
-    unsigned char fm;
+    __bitops_t f, b;
     unsigned int i;
     unsigned int freq;
+    unsigned char band;
 
-    b = akc6955_readcmd(AKC6955_CNR_AM) & 0x80;
-    l = akc6955_readcmd(AKC6955_RCH_LO) ;
-    h = akc6955_readcmd(AKC6955_RCH_HI) & 0x1f;
-    fm = akc6955_readcmd(AKC6955_POWER) & 0x40;
-    i = l + (h << 8);
-    if(fm != 0){ // 25KHz
-        freq = i << 1 + i >> 1 + 3000; // freq' = 25*i[KHz] = (25 / 10) *i [10KHz]
-                                       // = 2.5i[10KHz]
-                                       // freq = freq' + 30MHz = freq' + 3000[10KHz]
+    f.byte = akc6955_readcmd(AKC6955_POWER);
+    i = akc6955_get_channel();
+    if(f.b6){ // 25KHz
+        freq = (i * 5) / 2 + 3000; // freq' = 25*i[KHz] = (25 / 10) *i [10KHz]
     } else { // 5K
-       if(b == 0) { // 5KHz
-           freq = i << 2 + i; // freq = 5*i[KHz] = (4+1)*i[KHz]
-        } else { // 3KHz
-           freq = i << 1 + i; // freq = 3i[KHz] = (2+1)i[KHz]
-        }
+       b.byte = akc6955_readcmd(AKC6955_CH_HI);
+       akc6955_get_amband(band);
+       freq = i * 5;
+       if((band == AKC6955_BAND_MW2) || (b.b5)){
+           freq = i * 3;
+       }
     }
     return freq;
 }
@@ -264,35 +280,61 @@ unsigned int akc6955_get_freq(void)
 void akc6955_set_freq(unsigned int freq)
 {
     unsigned int ch;
-    unsigned char fm;
-    unsigned char mode3k = 0;
-
-    fm = akc6955_readcmd(AKC6955_POWER) & 0x40;
-    if(fm != 0) { // FM
-      ch = freq - 3000;
-      ch = ch << 2;
-      ch = ch / 10; // 10/25 = 0.4
+    __bitops_t f;
+    __bitops_t mode3k;
+    unsigned char band;
+    unsigned int start, stop;
+
+    f.byte = akc6955_readcmd(AKC6955_POWER);
+    if(f.b6) { // FM
+        akc6955_get_fmband(band);
+//        band &= 7;
+        if(band == AKC6955_BAND_FMUSER){
+            start = setup.fm_usrbands[setup.fm_userbandnum].start * 32;
+            stop = setup.fm_usrbands[setup.fm_userbandnum].stop * 32;
+        } else {
+            start = fmbands[band].start;
+            stop = fmbands[band].end;
+        }
+        ch = freq - 3000;
+        ch = (ch << 2) / 10;
     } else {
-        mode3k = akc6955_readcmd(AKC6955_CNR_AM) & 0x80;
-        if(mode3k == 0){
-            ch = freq / 5;
+        akc6955_get_amband(band);
+//        if(band >= AKC6955_BAND_AMEND) band = AKC6955_BAND_AMEND - 1;
+        if(band == AKC6955_BAND_AMUSER){
+            start = setup.am_usrbands[setup.am_userbandnum].start * 32;
+            stop = setup.am_usrbands[setup.am_userbandnum].stop * 32;
         } else {
+            start = ambands[band].start;
+            stop = ambands[band].end;
+        }
+        mode3k.byte = akc6955_readcmd(AKC6955_CNR_AM);
+        if(band == AKC6955_BAND_MW2) {
+            ch = (freq / 9) * 3; // See datasheet.
+        } else if(band == AKC6955_BAND_MW3) {
+            ch = freq / 5;
+        } else  if(mode3k.b7){
             ch = freq / 3;
+        } else {
+            ch = freq / 5;
         }
     }
-    akc6955_set_tune(mode3k, ch);
+    if(freq <  start) freq = start;
+    if(freq >= stop)   freq = stop - 1;
+    akc6955_set_tune(mode3k.b7, ch);
 }
 
 void akc6955_set_userband(unsigned char start, unsigned char stop, unsigned int ch, unsigned char mode3k)
 {
-    unsigned char fm;
-    fm = akc6955_readcmd(AKC6955_POWER) & 0x40;
+    __bitops_t f;
+
+    f.byte = akc6955_readcmd(AKC6955_POWER);
     akc6955_writecmd(AKC6955_UCH_ST, start);
     akc6955_writecmd(AKC6955_UCH_EN, stop);
-    if(fm == 0){
-        akc6955_set_amband(AKC6955_BAND_AMUSER);
-    } else {
+    if(f.b6){
         akc6955_set_fmband(AKC6955_BAND_FMUSER);
+    } else {
+        akc6955_set_amband(AKC6955_BAND_AMUSER);
     }
     akc6955_set_tune(mode3k, ch);
 }
@@ -300,38 +342,38 @@ void akc6955_set_userband(unsigned char start, unsigned char stop, unsigned int
 
 unsigned char akc6955_get_cnr(void)
 {
-    unsigned char fm;
-    unsigned char b;
-    fm = akc6955_readcmd(AKC6955_POWER) & 0x40;
-    if(fm != 0) { // FM
-        b = akc6955_readcmd(AKC6955_CNR_FM);
+    __bitops_t f;
+    __bitops_t b;
+    f.byte = akc6955_readcmd(AKC6955_POWER);
+    if(f.b6) { // FM
+        b.byte = akc6955_readcmd(AKC6955_CNR_FM);
     } else { // AM
-        b = akc6955_readcmd(AKC6955_CNR_AM);
+        b.byte = akc6955_readcmd(AKC6955_CNR_AM);
     }
-    b &= 0x7f;
-    return b;
+    b.b7 = 0;
+    return b.byte;
 }
 
 int akc6955_read_level(void)
 {
-    unsigned char fm;
+    __bitops_t f;
     unsigned char rflevel, iflevel;
     unsigned char b;
-    unsigned int rssi;
+    int rssi;
     unsigned int freq;
-    unsigned int totallevel;
+    int totallevel;
     int level;
 
-    fm = akc6955_readcmd(AKC6955_POWER) & 0x40;
+    f.byte = akc6955_readcmd(AKC6955_POWER);
     b =  akc6955_readcmd(AKC6955_PGALEVEL);
     rflevel = (b & 0xe0) >> 5;
     iflevel = (b & 0x1c) >> 2;
     totallevel = rflevel + iflevel;
 
-    rssi = (unsigned int)(akc6955_readcmd(AKC6955_RSSI) & 0x7f);
+    rssi = (int)(akc6955_readcmd(AKC6955_RSSI) & 0x7f);
     // totallevel = rssi + 6*totallevel;
-    level = (int)((totallevel << 2) + (totallevel << 1) + rssi);
-    if(fm != 0){
+    level = (int)(totallevel * 6 + rssi);
+    if(f.b6){
         level = 103 - level; // totallevel * 6
     } else {
         freq = akc6955_get_freq();
@@ -344,67 +386,87 @@ int akc6955_read_level(void)
     return level;
 }
 
+
 // Get diff. unit = 100Hz.
 int akc6955_get_diff(void)
 {
-    unsigned char diff;
-    unsigned char fm;
+    __bitops_t diff;
+    __bitops_t f;
     int n;
-    diff = akc6955_readcmd(AKC6955_FDNUM);
-    if(diff  <= 127) {
-        n = (int)diff & 0x007f;
+
+    diff.byte = akc6955_readcmd(AKC6955_FDNUM);
+    if(diff.b7) {
+        diff.b7 = 0;
+        n = -((int) diff.byte);
     } else {
-        n = -((int)(diff & 0x007f));
+        diff.b7 = 0;
+        n = (int)diff.byte;
     }
-    fm = akc6955_readcmd(AKC6955_POWER) & 0x40;
-    if(fm == 0) { // AM
-        return n;
-    } else {
-        return (n << 3 + n << 1); // 10n
+
+    f.byte = akc6955_readcmd(AKC6955_POWER);
+    if(f.b6) { // FM
+        return n * 10;
     }
+    return n; // 10n
 }
 
-unsigned int akc6955_up_freq(unsigned int step)
+void akc6955_up_freq(unsigned int step)
 {
     unsigned int freq;
-    freq = akc6955_get_freq();
+    __bitops_t mode3k;
+
+    freq = akc6955_get_channel();
     freq += step;
-    akc6955_set_freq(freq);
-    return akc6955_get_freq();
+    mode3k.byte = akc6955_readcmd(AKC6955_CNR_AM);
+    akc6955_set_tune(mode3k.b7, freq);
 }
 
 
-unsigned int akc6955_down_freq(unsigned int step)
+void akc6955_down_freq(unsigned int step)
 {
     unsigned int freq;
-    freq = akc6955_get_freq();
-    if(freq <= step) return freq;
+    __bitops_t mode3k;
+
+    freq = akc6955_get_channel();
+    if(freq <= step) return;
     freq -= step;
-    akc6955_set_freq(freq);
-    return akc6955_get_freq();
+    mode3k.byte = akc6955_readcmd(AKC6955_CNR_AM);
+    akc6955_set_tune(mode3k.b7, freq);
 }
+
 void akc6955_setvolumemode(unsigned char flag)
 {
-    unsigned char c;
-    c = akc6955_readcmd(AKC6955_ENABLE) & 0xf7;
+    __bitops_t c;
+    c.byte = akc6955_readcmd(AKC6955_ENABLE);
+    c.b3 = 0;
     if(flag != 0x00){
-        c |= 0x08;
+        c.b3 = 1;
+    }
+    akc6955_writecmd(AKC6955_ENABLE, c.byte);
+}
+
+unsigned char akc6955_getvolumemode(void)
+{
+    __bitops_t c;
+    c.byte = akc6955_readcmd(AKC6955_ENABLE);
+    if(c.b3){
+        return 0xff;
     }
-    akc6955_writecmd(AKC6955_ENABLE, c);
+    return 0;
 }
 
 void akc6955_setvolume(unsigned char level)
 {
-    unsigned char c;
-    c = akc6955_readcmd(AKC6955_VOLUME) & 0x03;
+//    unsigned char c;
+//    c = akc6955_readcmd(AKC6955_VOLUME) & 0x03;
     if(level > 63) level = 63;
-    akc6955_writecmd(AKC6955_VOLUME, (c | (level << 2)));
+    akc6955_writecmd(AKC6955_VOLUME, ((akc6955_readcmd(AKC6955_VOLUME) & 0x03) | (level << 2)));
 }
 
 unsigned char akc6955_getvolume(void)
 {
     unsigned char c;
-    c = (akc6955_readcmd(AKC6955_VOLUME) & 0xfc) >> 2;
+    c = akc6955_readcmd(AKC6955_VOLUME) >> 2;
     return c;
 }
 
@@ -427,40 +489,36 @@ unsigned char akc6955_get_prevolume(void)
 
 void akc6955_setphase(unsigned char flag)
 {
-    unsigned char c;
-    c = akc6955_readcmd(AKC6955_VOLUME);
+    __bitops_t c;
+    c.byte = akc6955_readcmd(AKC6955_VOLUME);
 
+    c.b0 = 1;
     if(flag == 0) {
-        c = c & 0xfe; //
-    } else {
-        c = c | 0x01;
+        c.b0 = 0; //
     }
-    akc6955_writecmd(AKC6955_VOLUME, c);
+    akc6955_writecmd(AKC6955_VOLUME, c.byte);
 }
 
 void akc6955_setline(unsigned char flag)
 {
-    unsigned char c;
-    c = akc6955_readcmd(AKC6955_VOLUME);
-
+    __bitops_t c;
+    c.byte = akc6955_readcmd(AKC6955_VOLUME);
+    c.b1 = 1;
     if(flag == 0) {
-        c = c & 0xfd; //
-    } else {
-        c = c | 0x02;
+        c.b1 = 0;
     }
-    akc6955_writecmd(AKC6955_VOLUME, c);
+    akc6955_writecmd(AKC6955_VOLUME, c.byte);
 }
 
 void akc6955_set_lowboost(unsigned char flag)
 {
-    unsigned char c;
-    c = akc6955_readcmd(AKC6955_STEREO);
+    __bitops_t c;
+    c.byte = akc6955_readcmd(AKC6955_STEREO);
+    c.b3 = 1;
     if(flag == 0) {
-        c &= 0xf7;
-    } else {
-        c |= 0x08;
+        c.b3 = 0;
     }
-    akc6955_writecmd(AKC6955_STEREO, c);
+    akc6955_writecmd(AKC6955_STEREO, c.byte);
 }
 
 void akc6955_set_stereomode(unsigned char mode)
@@ -476,40 +534,7 @@ unsigned char akc6955_get_stereo(void)
 {
     unsigned char c;
     c = akc6955_readcmd(AKC6955_RCH_HI) & 0x80;
-    if(c == 0) return 0x00;
-    return 0xff;
-}
-
-void akc6955_set_fm_threash(unsigned char val)
-{
-    unsigned char c = akc6955_readcmd(AKC6955_THRESH);
-    val = val & 0x03;
-    c = (c & 0x3f) | (val << 6);
-    akc6955_writecmd(AKC6955_THRESH, c);
-}
-
-void akc6955_set_am_threash(unsigned char val)
-{
-    unsigned char c = akc6955_readcmd(AKC6955_THRESH);
-    val = val & 0x03;
-    c = (c & 0xcf) | (val << 4);
-    akc6955_writecmd(AKC6955_THRESH, c);
-}
-
-void akc6955_set_fd_threash(unsigned char val)
-{
-    unsigned char c = akc6955_readcmd(AKC6955_THRESH);
-    val = val & 0x03;
-    c = (c & 0xf3) | (val << 2);
-    akc6955_writecmd(AKC6955_THRESH, c);
-}
-
-void akc6955_set_stereo_threash(unsigned char val)
-{
-    unsigned char c = akc6955_readcmd(AKC6955_THRESH);
-    val = val & 0x03;
-    c = (c & 0xfc) | val ;
-    akc6955_writecmd(AKC6955_THRESH, c);
+    return c;
 }
 
 /*
@@ -522,25 +547,45 @@ unsigned int akc6955_get_battery(void)
     unsigned int batt;
     unsigned char c;
     c = akc6955_readcmd(AKC6955_VBAT) & 0x3f;
-    batt = 180 + (c << 2) + c;
+    batt = 180 + c * 5;
     return batt;
 }
 
-/*
- * 0 = 150KHz
- * 1 = 200KHz
- * 2 = 50KHz
- * 3 = 100KHz
- */
-void akc6955_set_fmbandwidth(unsigned char bw)
+void akc6955_set_thresh_fmstereo(unsigned char a)
 {
-    unsigned char c = akc6955_readcmd(AKC6955_STEREO);
-    c = (c & 0xfc) | (bw & 0x03);
-    akc6955_writecmd(AKC6955_STEREO, c);
+    unsigned char b;
+    a = a & 0x03;
+    setup.threshold_fmstereo = a;
+    b = akc6955_readcmd(AKC6955_THRESH) & 0xfc;
+    akc6955_writecmd(AKC6955_THRESH, a | b);
 }
 
-unsigned char akc6955_get_fmbandwidth(void)
+void akc6955_set_thresh_width(unsigned char a)
 {
-    unsigned char c = akc6955_readcmd(AKC6955_STEREO) & 0x03;
-    return c;
+    unsigned char b;
+    a = a & 0x03;
+    setup.threshold_width = a;
+    a = a << 2; // << 2
+    b = akc6955_readcmd(AKC6955_THRESH) & 0xf3;;
+    akc6955_writecmd(AKC6955_THRESH, a | b);
+}
+
+void akc6955_set_thresh_amcnr(unsigned char a)
+{
+    unsigned char b;
+    a = a & 0x03;
+    setup.threshold_amcnr = a;
+    a = a << 4; // << 4
+    b = akc6955_readcmd(AKC6955_THRESH) & 0xcf;
+    akc6955_writecmd(AKC6955_THRESH, a | b);
+}
+
+void akc6955_set_thresh_fmcnr(unsigned char a)
+{
+    unsigned char b;
+    a = a & 0x03;
+    setup.threshold_fmcnr = a;
+    a = a << 6; // << 4
+    b = akc6955_readcmd(AKC6955_THRESH) & 0x3f;
+    akc6955_writecmd(AKC6955_THRESH, a | b);
 }