From 5b713a1f26017a685ce4998d91819409c437c59d Mon Sep 17 00:00:00 2001 From: Mariano Alvira Date: Fri, 19 Mar 2010 22:29:27 -0400 Subject: [PATCH] rename radio_on off to maca_on off --- lib/include/maca.h | 4 ++-- lib/maca.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/include/maca.h b/lib/include/maca.h index 1dcb72ef2..a63caa6ed 100644 --- a/lib/include/maca.h +++ b/lib/include/maca.h @@ -116,8 +116,8 @@ void init_phy(void); void flyback_init(void); void ResumeMACASync(void); void radio_init(void); -void radio_off(void); -void radio_on(void); +void maca_off(void); +void maca_on(void); uint32_t init_from_flash(uint32_t addr); void set_power(uint8_t power); void set_channel(uint8_t chan); diff --git a/lib/maca.c b/lib/maca.c index 0583bae0e..090f4e6c7 100644 --- a/lib/maca.c +++ b/lib/maca.c @@ -550,7 +550,7 @@ const uint32_t addr_reg_rep[MAX_DATA] = { 0x80004118,0x80009204,0x80009208,0x800 const uint32_t data_reg_rep[MAX_DATA] = { 0x00180012,0x00000605,0x00000504,0x00001111,0x0fc40000,0x20046000,0x4005580c,0x40075801,0x4005d801,0x5a45d800,0x4a45d800,0x40044000,0x00106000,0x00083806,0x00093807,0x0009b804,0x000db800,0x00093802,0x00000015,0x00000002,0x0000000f,0x0000aaa0,0x01002020,0x016800fe,0x8e578248,0x000000dd,0x00000946,0x0000035a,0x00100010,0x00000515,0x00397feb,0x00180358,0x00000455,0x00000001,0x00020003,0x00040014,0x00240034,0x00440144,0x02440344,0x04440544,0x0ee7fc00,0x00000082,0x0000002a }; -void radio_off(void) { +void maca_off(void) { disable_irq(MACA); /* turn off the radio regulators */ reg(0x80003048) = 0x00000f00; @@ -558,7 +558,7 @@ void radio_off(void) { maca_reset = maca_reset_rst; } -void radio_on(void) { +void maca_on(void) { /* turn the radio regulators back on */ reg(0x80003048) = 0x00000f78; /* reinitialize the phy */