giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move non-configuration macros to msp430def.h

This commit is contained in:
George Oikonomou 2017-12-08 16:43:35 +00:00
parent 49cb138020
commit fdb60ab22f
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/cpu/msp430/msp430def.h
View File

@ -85,14 +85,22 @@ typedef int32_t s32_t;
#else
#define DCOSYNCH_PERIOD 30
#endif
/* Types for clocks and uip_stats */
typedef unsigned short uip_stats_t;
typedef unsigned long clock_time_t;
typedef long off_t;
void msp430_cpu_init(void); /* Rename to cpu_init() later! */
void msp430_sync_dco(void);
/* Our clock resolution, this is the same as Unix HZ. */
#define CLOCK_CONF_SECOND 128UL
#define cpu_init() msp430_cpu_init()
void *sbrk(int);
#define CCIF
#define CLIF
typedef int spl_t;
/* void splx_(spl_t); */
@ -133,6 +141,11 @@ void *w_memset(void *out, int value, size_t n);
#define MSP430_REQUIRE_LPM2 2
#define MSP430_REQUIRE_LPM3 3
/* Platform-specific checksum implementation */
#define UIP_ARCH_IPCHKSUM 1
#define BAUD2UBR(baud) ((F_CPU/baud))
void msp430_add_lpm_req(int req);
void msp430_remove_lpm_req(int req);

3
arch/platform/sky/contiki-conf.h
View File

@ -30,9 +30,6 @@
#define UIP_CONF_BUFFER_SIZE 240
#endif
/* Platform-specific checksum implementation */
#define UIP_ARCH_IPCHKSUM 1
/* Platform-specific (H/W) AES implementation */
#ifndef AES_128_CONF
#define AES_128_CONF cc2420_aes_128_driver

17
arch/platform/sky/platform-conf.h
View File

@ -67,23 +67,6 @@
/* CPU target speed in Hz */
#define F_CPU 3900000uL /*2457600uL*/
/* Our clock resolution, this is the same as Unix HZ. */
#define CLOCK_CONF_SECOND 128UL
#define BAUD2UBR(baud) ((F_CPU/baud))
#define CCIF
#define CLIF
#define HAVE_STDINT_H
#include "msp430def.h"
/* Types for clocks and uip_stats */
typedef unsigned short uip_stats_t;
typedef unsigned long clock_time_t;
typedef long off_t;
/* the low-level radio driver */
#define NETSTACK_CONF_RADIO cc2420_driver