qi-hardware/ben-wpan
1
0
Fork 0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2024-11-23 04:45:19 +02:00
Code

dirtly made the atrf tools run with the new atusd board

Browse Source 
- lib/atusd.c: renamed CLK to SLP_TR
- lib/atusd.c (atusd_cycle, atusd_cycle, atusd_open, atusd_close):
  #ifdef'ed all uses of CLK and changed them to SLP_TR (along with the
  change in function)
- atrf-txrx/atrf-txrx.c (init_txrx): always use the crystal oscillator
This commit is contained in:
Werner Almesberger 2011-01-16 16:03:11 -03:00
parent 507bcaff5a
commit ebe667197a
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/atrf-txrx/atrf-txrx.c
View File

@ -76,7 +76,7 @@ static struct atrf_dsc *init_txrx(int trim, unsigned clkm)
atrf_reset_rf(dsc); atrf_reset_rf(dsc);
atrf_reg_write(dsc, REG_TRX_STATE, TRX_CMD_TRX_OFF); atrf_reg_write(dsc, REG_TRX_STATE, TRX_CMD_TRX_OFF);
#ifdef HAVE_USB /* @@@ yeah, ugly */ #if 1 // def HAVE_USB /* @@@ yeah, ugly */
atrf_reg_write(dsc, REG_XOSC_CTRL, atrf_reg_write(dsc, REG_XOSC_CTRL,
(XTAL_MODE_INT << XTAL_MODE_SHIFT) | trim); (XTAL_MODE_INT << XTAL_MODE_SHIFT) | trim);
#else #else

26
tools/lib/atusd.c
View File

@ -25,7 +25,11 @@
enum { enum {
VDD_OFF = 1 << 2, /* VDD disable, PD02 */ VDD_OFF = 1 << 2, /* VDD disable, PD02 */
MOSI = 1 << 8, /* CMD, PD08 */ MOSI = 1 << 8, /* CMD, PD08 */
#ifdef OLD
CLK = 1 << 9, /* CLK, PD09 */ CLK = 1 << 9, /* CLK, PD09 */
#else
SLP_TR = 1 << 9, /* CLK, PD09 */
#endif
MISO = 1 << 10, /* DAT0, PD10 */ MISO = 1 << 10, /* DAT0, PD10 */
SCLK = 1 << 11, /* DAT1, PD11 */ SCLK = 1 << 11, /* DAT1, PD11 */
IRQ = 1 << 12, /* DAT2, PD12 */ IRQ = 1 << 12, /* DAT2, PD12 */
@ -84,10 +88,15 @@ static void atusd_cycle(struct atusd_dsc *dsc)
MSC_STRPCL = 1; MSC_STRPCL = 1;
/* drive all outputs low (including the MMC bus clock) */ /* drive all outputs low (including the MMC bus clock) */
#ifdef OLD
PDDATC = MOSI | CLK | SCLK | nSEL; PDDATC = MOSI | CLK | SCLK | nSEL;
/* make the MMC bus clock a regular output */ /* make the MMC bus clock a regular output */
PDFUNC = CLK; PDFUNC = CLK;
#else
PDDATC = MOSI | SLP_TR | SCLK | nSEL;
PDFUNC = SLP_TR;
#endif
/* cut the power */ /* cut the power */
PDDATS = VDD_OFF; PDDATS = VDD_OFF;
@ -101,11 +110,14 @@ static void atusd_cycle(struct atusd_dsc *dsc)
/* precharge the capacitors to avoid current surge */ /* precharge the capacitors to avoid current surge */
wait_for_power(); wait_for_power();
#ifdef OLD
/* return the bus clock output to the MMC controller */ /* return the bus clock output to the MMC controller */
PDFUNS = CLK; PDFUNS = CLK;
/* start MMC clock output */ /* start MMC clock output */
MSC_STRPCL = 2; MSC_STRPCL = 2;
#endif
/* supply power */ /* supply power */
PDDATC = VDD_OFF; PDDATC = VDD_OFF;
@ -198,12 +210,20 @@ static void *atusd_open(void)
PDDATC = SCLK; PDDATC = SCLK;
/* take the GPIOs away from the MMC controller */ /* take the GPIOs away from the MMC controller */
#ifdef OLD
PDFUNC = MOSI | MISO | SCLK | IRQ | nSEL; PDFUNC = MOSI | MISO | SCLK | IRQ | nSEL;
PDFUNS = CLK; PDFUNS = CLK;
#else
PDFUNC = MOSI | MISO | SCLK | IRQ | nSEL | SLP_TR;
#endif
/* set the pin directions */ /* set the pin directions */
PDDIRC = MISO | IRQ; PDDIRC = MISO | IRQ;
#ifdef OLD
PDDIRS = MOSI | CLK | SCLK | nSEL; PDDIRS = MOSI | CLK | SCLK | nSEL;
#else
PDDIRS = MOSI | SLP_TR | SCLK | nSEL;
#endif
/* let capacitors precharge */ /* let capacitors precharge */
wait_for_power(); wait_for_power();
@ -211,6 +231,7 @@ static void *atusd_open(void)
/* enable power */ /* enable power */
PDDATC = VDD_OFF; PDDATC = VDD_OFF;
#ifdef OLD
/* set the MSC clock to 316 MHz / 21 = 16 MHz */ /* set the MSC clock to 316 MHz / 21 = 16 MHz */
MSCCDR = 20; MSCCDR = 20;
/* /*
@ -222,6 +243,7 @@ static void *atusd_open(void)
MSC_CLKRT = 0; MSC_CLKRT = 0;
/* start MMC clock output */ /* start MMC clock output */
MSC_STRPCL = 2; MSC_STRPCL = 2;
#endif
wait_for_power(); wait_for_power();
atusd_reset_rf(dsc); atusd_reset_rf(dsc);
@ -241,7 +263,11 @@ static void atusd_close(void *arg)
PDDATS = VDD_OFF; PDDATS = VDD_OFF;
/* make all MMC pins inputs */ /* make all MMC pins inputs */
#ifdef OLD
PDDIRC = MOSI | MISO | CLK | SCLK | IRQ | nSEL; PDDIRC = MOSI | MISO | CLK | SCLK | IRQ | nSEL;
#else
PDDIRC = MOSI | MISO | SLP_TR | SCLK | IRQ | nSEL;
#endif
} }