Skip to content

Commit

Permalink
replaced references to PORTB, DDRB, SPI_SS, SPI_SCK, SPI_MOSI, SPI_MI…
Browse files Browse the repository at this point in the history
…SO with abstract arduino references and or digitalWrite, pinMode calls
  • Loading branch information
vicatcu committed Oct 7, 2012
1 parent cbb2fd8 commit ecb62d9
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions enc28j60.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,30 +251,30 @@ word ENC28J60::bufferSize;

static byte Enc28j60Bank;
static int gNextPacketPtr;
static byte selectBit; // 0 = B0 = pin 8, 1 = B1 = pin 9, 2 = B2 = pin 10
static byte selectPin;

void ENC28J60::initSPI () {
pinMode(SPI_SS, OUTPUT);
digitalWrite(SPI_SS, HIGH);
pinMode(SPI_MOSI, OUTPUT);
pinMode(SPI_SCK, OUTPUT);
pinMode(SPI_MISO, INPUT);
pinMode(SS, OUTPUT);
digitalWrite(SS, HIGH);
pinMode(MOSI, OUTPUT);
pinMode(SCK, OUTPUT);
pinMode(MISO, INPUT);

digitalWrite(SPI_MOSI, HIGH);
digitalWrite(SPI_MOSI, LOW);
digitalWrite(SPI_SCK, LOW);
digitalWrite(MOSI, HIGH);
digitalWrite(MOSI, LOW);
digitalWrite(SCK, LOW);

SPCR = bit(SPE) | bit(MSTR); // 8 MHz @ 16
bitSet(SPSR, SPI2X);
}

static void enableChip () {
cli();
bitClear(PORTB, selectBit);
digitalWrite(selectPin, LOW);
}

static void disableChip () {
bitSet(PORTB, selectBit);
digitalWrite(selectPin, HIGH);
sei();
}

Expand Down Expand Up @@ -367,8 +367,8 @@ byte ENC28J60::initialize (word size, const byte* macaddr, byte csPin) {
bufferSize = size;
if (bitRead(SPCR, SPE) == 0)
initSPI();
selectBit = csPin - 8;
bitSet(DDRB, selectBit);
selectPin = csPin;
pinMode(selectPin, OUTPUT);
disableChip();

writeOp(ENC28J60_SOFT_RESET, 0, ENC28J60_SOFT_RESET);
Expand Down Expand Up @@ -521,8 +521,8 @@ uint8_t ENC28J60::doBIST ( byte csPin) {
// init
if (bitRead(SPCR, SPE) == 0)
initSPI();
selectBit = csPin - 8;
bitSet(DDRB, selectBit);
selectPin = csPin;
pinMode(selectPin, OUTPUT);
disableChip();

writeOp(ENC28J60_SOFT_RESET, 0, ENC28J60_SOFT_RESET);
Expand Down

0 comments on commit ecb62d9

Please sign in to comment.