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

Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x

Browse source
This commit is contained in:
Mariano Alvira 2010-03-16 10:49:49 -04:00
commit 011c6e7276
4 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
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);
@ -758,6 +752,8 @@ const uint32_t AIMVAL[19] = {
#define ADDR_POW2 ADDR_POW1 + 12 #define ADDR_POW2 ADDR_POW1 + 12
#define ADDR_POW3 ADDR_POW1 + 64 #define ADDR_POW3 ADDR_POW1 + 64
void set_power(uint8_t power) { void set_power(uint8_t power) {
safe_irq_disable(MACA);
reg(ADDR_POW1) = PSMVAL[power]; reg(ADDR_POW1) = PSMVAL[power];
/* see http://devl.org/pipermail/mc1322x/2009-October/000065.html */ /* see http://devl.org/pipermail/mc1322x/2009-October/000065.html */
@ -769,6 +765,8 @@ void set_power(uint8_t power) {
#endif #endif
reg(ADDR_POW3) = AIMVAL[power]; reg(ADDR_POW3) = AIMVAL[power];
irq_restore();
} }
const uint8_t VCODivI[16] = { const uint8_t VCODivI[16] = {
@ -816,6 +814,7 @@ const uint32_t VCODivF[16] = {
#define ADDR_CHAN4 (ADDR_CHAN1+48) #define ADDR_CHAN4 (ADDR_CHAN1+48)
void set_channel(uint8_t chan) { void set_channel(uint8_t chan) {
volatile uint32_t tmp; volatile uint32_t tmp;
safe_irq_disable(MACA);
tmp = reg(ADDR_CHAN1); tmp = reg(ADDR_CHAN1);
tmp = tmp & 0xbfffffff; tmp = tmp & 0xbfffffff;
@ -836,6 +835,7 @@ void set_channel(uint8_t chan) {
tmp = tmp | (((ctov[chan])<<8)&0x1F00); tmp = tmp | (((ctov[chan])<<8)&0x1F00);
reg(ADDR_CHAN4) = tmp; reg(ADDR_CHAN4) = tmp;
/* duh! */ /* duh! */
irq_restore();
} }
#define ROM_END 0x0013ffff #define ROM_END 0x0013ffff

2
src/default_lowlevel.h
View file

@ -1,8 +1,8 @@
#ifndef LOWLEVEL_H #ifndef LOWLEVEL_H
#define LOWLEVEL_H #define LOWLEVEL_H
#define trim_xtal() pack_XTAL_CNTL(CTUNE_4PF, CTUNE, FTUNE, IBIAS);
void default_vreg_init(void); void default_vreg_init(void);
void uart1_init(uint16_t inc, uint16_t mod, uint8_t samp); void uart1_init(uint16_t inc, uint16_t mod, uint8_t samp);
#endif #endif

2
tests/rftest-rx.c
View file

@ -23,7 +23,7 @@ void main(void) {
*GPIO_DATA_SEL0 = ( 1 << LED ); *GPIO_DATA_SEL0 = ( 1 << LED );
/* trim the reference osc. to 24MHz */ /* trim the reference osc. to 24MHz */
pack_XTAL_CNTL(CTUNE_4PF, CTUNE, FTUNE, IBIAS); trim_xtal();
uart_init(INC, MOD, SAMP); uart_init(INC, MOD, SAMP);

2
tests/rftest-tx.c
View file

@ -33,7 +33,7 @@ void main(void) {
volatile packet_t *p; volatile packet_t *p;
/* trim the reference osc. to 24MHz */ /* trim the reference osc. to 24MHz */
pack_XTAL_CNTL(CTUNE_4PF, CTUNE, FTUNE, IBIAS); trim_xtal();
uart_init(INC, MOD, SAMP); uart_init(INC, MOD, SAMP);