deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

init_phy was doing phy initialization and maca reset. maca_reset was

Browse source 
doing nothing useful. This patch factors init_phy and rewrites
maca_reset.
This commit is contained in:
Mariano Alvira 2010-03-16 10:31:35 -04:00
parent 07e6b65182
commit 2aa76aaacd
1 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
lib/maca.c
View file

@ -423,45 +423,38 @@ static uint8_t ram_values[4];
void init_phy(void) void init_phy(void)
{ {
volatile uint32_t cnt;
*MACA_RESET = (1 << maca_reset_rst);
for(cnt = 0; cnt < 100; cnt++) {};
*MACA_RESET = (1 << maca_reset_clkon);
*MACA_CONTROL = maca_ctrl_seq_nop;
for(cnt = 0; cnt < 400000; cnt++) {};
// *MACA_TMREN = (1 << maca_tmren_strt) | (1 << maca_tmren_cpl); // *MACA_TMREN = (1 << maca_tmren_strt) | (1 << maca_tmren_cpl);
*MACA_CLKDIV = MACA_CLOCK_DIV; *MACA_CLKDIV = MACA_CLOCK_DIV;
*MACA_WARMUP = 0x00180012; *MACA_WARMUP = 0x00180012;
*MACA_EOFDELAY = 0x00000004; *MACA_EOFDELAY = 0x00000004;
*MACA_CCADELAY = 0x001a0022; *MACA_CCADELAY = 0x001a0022;
*MACA_TXCCADELAY = 0x00000025; *MACA_TXCCADELAY = 0x00000025;
*MACA_FRAMESYNC0 = 0x000000A7; *MACA_FRAMESYNC0 = 0x000000A7;
*MACA_CLK = 0x00000008; *MACA_CLK = 0x00000008;
*MACA_MASKIRQ = ((1 << maca_irq_rst) | *MACA_MASKIRQ = ((1 << maca_irq_rst) |
(1 << maca_irq_acpl) | (1 << maca_irq_acpl) |
(1 << maca_irq_cm) | (1 << maca_irq_cm) |
(1 << maca_irq_flt) | (1 << maca_irq_flt) |
(1 << maca_irq_crc) | (1 << maca_irq_crc) |
(1 << maca_irq_di) | (1 << maca_irq_di) |
(1 << maca_irq_sftclk) (1 << maca_irq_sftclk)
); );
*MACA_SLOTOFFSET = 0x00350000; *MACA_SLOTOFFSET = 0x00350000;
} }
void reset_maca(void) void reset_maca(void)
{ {
uint32_t tmp; volatile uint32_t cnt;
*MACA_RESET = (1 << maca_reset_rst);
for(cnt = 0; cnt < 100; cnt++) {};
*MACA_RESET = (1 << maca_reset_clkon);
*MACA_CONTROL = maca_ctrl_seq_nop; *MACA_CONTROL = maca_ctrl_seq_nop;
do {
tmp = *MACA_STATUS; for(cnt = 0; cnt < 400000; cnt++) {};
} while ((tmp & 0xf) == maca_cc_not_completed);
/* Clear all interrupts. */ /* Clear all interrupts. */
*MACA_CLRIRQ = 0xffff; *MACA_CLRIRQ = 0xffff;
@ -580,6 +573,7 @@ void radio_on(void) {
/* turn the radio regulators back on */ /* turn the radio regulators back on */
reg(0x80003048) = 0x00000f78; reg(0x80003048) = 0x00000f78;
/* reinitialize the phy */ /* reinitialize the phy */
reset_maca();
init_phy(); init_phy();
enable_irq(MACA); enable_irq(MACA);