Fixes and improvements from Anthony Asterisk
- First in 8051def.h, it appears the uip_arch-asm.S file was copied from z80 and am unsure it will work properly. I modified the 8051def.h to prevent the UIP code from using these routines. - In dma.c the config routine provides access to all of the DMA channel options, except for the word mode flag. In order to maintain compatibility with any existing code I created a second routine and converted the original routine into a wrapper routine with a fixed word mode value. - uart.c::uart0_init was missing blocking access to the higher baud rates. I am not sure why, so I corrected this. - I also copied over to header files that provide some useful macros from the msp430 cpu. The files are lpm.h and hwconf.h. The lpm.h is for switching power modes, I think. The hwconf.h has various macros for configuring port I/O. By porting these files the led/button api's can be ported with minimal modifications.
This commit is contained in:
zdshelby
parent
e032f7ac2c
commit
c5ecde4ca0
7 changed files with 213 additions and 22 deletions
89
cpu/cc2430/dev/hwconf.h
Normal file
89
cpu/cc2430/dev/hwconf.h
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
/*
|
||||
* Copyright (c) 2005, Swedish Institute of Computer Science
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* @(#)$Id: hwconf.h,v 1.1 2009/12/22 09:28:15 zdshelby Exp $
|
||||
*/
|
||||
#ifndef __HWCONF_H__
|
||||
#define __HWCONF_H__
|
||||
|
||||
#include "sys/cc.h"
|
||||
|
||||
#include <cc2430_sfr.h>
|
||||
extern uint8_t p0ien;
|
||||
extern uint8_t p2ien;
|
||||
|
||||
#define HWCONF_PIN(name, port, bit) \
|
||||
static CC_INLINE void name##_SELECT() { P##port##SEL &= ~(1 << bit);} \
|
||||
static CC_INLINE void name##_SELECT_IO() { P##port##SEL &= ~(1 << bit);} \
|
||||
static CC_INLINE void name##_SELECT_PM() { P##port##SEL |= 1 << bit;} \
|
||||
static CC_INLINE void name##_SET() { P##port##_##bit = 1; } \
|
||||
static CC_INLINE void name##_CLEAR() { P##port##_##bit = 0; } \
|
||||
static CC_INLINE unsigned char name##_READ() { return P##port##_##bit; } \
|
||||
static CC_INLINE void name##_MAKE_OUTPUT() { P##port##DIR |= 1 << bit;} \
|
||||
static CC_INLINE void name##_MAKE_INPUT() { P##port##DIR &= ~(1 << bit); }
|
||||
|
||||
#define HWCONF_IRQ_XXX(name, port, bit) \
|
||||
static CC_INLINE void name##_ENABLE_IRQ() { \
|
||||
if ( port == 2 ) { PICTL |= P2IEN; p2ien |= 1<<bit; } \
|
||||
if (( port == 0) && ( bit <4)) { PICTL |= P0IENL; p0ien |= 1<<bit; } \
|
||||
if ((port == 0) && ( bit >=4)) { PICTL |= P0IENH; p0ien |= 1<<bit; } \
|
||||
if ( port == 1) { P##port##IEN |= 1 << bit; } \
|
||||
} \
|
||||
static CC_INLINE void name##_DISABLE_IRQ() { \
|
||||
if ( port == 2 ) { \
|
||||
p2ien &= ~(1<<bit); \
|
||||
if (p2ien==0) PICTL &= ~P2IEN; \
|
||||
} \
|
||||
if (( port == 0) && ( bit <4)) { \
|
||||
p0ien &= ~(1<<bit); \
|
||||
if ((p0ien&0xf)==0) PICTL &= ~P0IENL; \
|
||||
} \
|
||||
if (( port == 0) && ( bit >=4)) { \
|
||||
p0ien &= ~(1<<bit); \
|
||||
if ((p0ien&0xf0)==0) PICTL &= ~P0IENH; \
|
||||
} \
|
||||
if ( port == 1) { P##port##IEN &= ~(1 << bit); } \
|
||||
} \
|
||||
static CC_INLINE int name##_IRQ_ENABLED() {return P##port##IEN & (1 << bit);} \
|
||||
static CC_INLINE int name##_CHECK_IRQ() {return P##port##IFG & (1 << bit);} \
|
||||
static CC_INLINE int name##_IRQ_PORT() {return IRQ_PORT##port;}
|
||||
|
||||
#define HWCONF_IRQ(name, port, bit) \
|
||||
static CC_INLINE void name##_ENABLE_IRQ() { \
|
||||
if ( port == 1) { P##port##IEN |= 1 << bit; } \
|
||||
} \
|
||||
static CC_INLINE void name##_DISABLE_IRQ() { \
|
||||
if ( port == 1) { P##port##IEN &= ~(1 << bit); } \
|
||||
} \
|
||||
static CC_INLINE int name##_IRQ_ENABLED() {return P##port##IEN & (1 << bit);} \
|
||||
static CC_INLINE int name##_CHECK_IRQ() {return P##port##IFG & (1 << bit);} \
|
||||
static CC_INLINE int name##_IRQ_PORT() {return IRQ_PORT##port;}
|
||||
|
||||
#endif /* __HWCONF_H__ */
|
||||
Loading…
Add table
Add a link
Reference in a new issue