From: travisutk Date: Sat, 12 Feb 2011 21:39:10 +0000 (+0000) Subject: Redefined P2.6 (!RST) to be CE on the GoodFET platform. X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=bf49109a5835ae36bac4d114825ec70b73ea8fd1 Redefined P2.6 (!RST) to be CE on the GoodFET platform. Should support nRF24L01+ modules from Sparkfun. git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@912 12e2690d-a6be-4b82-a7b7-67c4a43b65c8 --- diff --git a/firmware/platforms/goodfet.h b/firmware/platforms/goodfet.h index a9288b2..e9ba90e 100644 --- a/firmware/platforms/goodfet.h +++ b/firmware/platforms/goodfet.h @@ -44,12 +44,10 @@ #define CLRSS P5OUT&=~BIT0 #define DIRSS P5DIR|=BIT0; -//BIT5 is Chip Enable. Need to document this -//#define RADIOACTIVE P5OUT|=BIT5 -//#define RADIOPASSIVE P5OUT&=~BIT5 -#define SETCE P5OUT|=BIT5 -#define CLRCE P5OUT&=~BIT5 -#define DIRCE P5DIR|=BIT5 +//Used for the Nordic port, !RST pin on regular GoodFET. +#define SETCE P2OUT|=BIT6 +#define CLRCE P2OUT&=~BIT6 +#define DIRCE P2DIR|=BIT6 // network byte order converters #define htons(x) ((((uint16_t)(x) & 0xFF00) >> 8) | \ diff --git a/firmware/platforms/nhbadge.h b/firmware/platforms/nhbadge.h index 8e3e59f..aee7dde 100644 --- a/firmware/platforms/nhbadge.h +++ b/firmware/platforms/nhbadge.h @@ -31,3 +31,14 @@ #define SPIDIR P5DIR #define SPIIN P5IN #define SPIREN P5REN + +// network byte order converters +#define htons(x) ((((uint16_t)(x) & 0xFF00) >> 8) | \ + (((uint16_t)(x) & 0x00FF) << 8)) +#define htonl(x) ((((uint32_t)(x) & 0xFF000000) >> 24) | \ + (((uint32_t)(x) & 0x00FF0000) >> 8) | \ + (((uint32_t)(x) & 0x0000FF00) << 8) | \ + (((uint32_t)(x) & 0x000000FF) << 24)) + +#define ntohs htons +#define ntohl htonl diff --git a/firmware/platforms/nhbadgeb.h b/firmware/platforms/nhbadgeb.h index 57efd0b..771d288 100644 --- a/firmware/platforms/nhbadgeb.h +++ b/firmware/platforms/nhbadgeb.h @@ -38,3 +38,13 @@ #define CLRCE P4OUT&=~BIT5 #define DIRCE P4DIR|=BIT5 +// network byte order converters +#define htons(x) ((((uint16_t)(x) & 0xFF00) >> 8) | \ + (((uint16_t)(x) & 0x00FF) << 8)) +#define htonl(x) ((((uint32_t)(x) & 0xFF000000) >> 24) | \ + (((uint32_t)(x) & 0x00FF0000) >> 8) | \ + (((uint32_t)(x) & 0x0000FF00) << 8) | \ + (((uint32_t)(x) & 0x000000FF) << 24)) + +#define ntohs htons +#define ntohl htonl