Diff: W25X40BV.cpp

Revision:

1:cd41b8e3fdad

Parent:

0:9de212faf980

Child:

3:6e3c0b23dc6e

--- a/W25X40BV.cpp	Mon Mar 19 10:20:37 2012 +0000
+++ b/W25X40BV.cpp	Mon Mar 19 14:55:24 2012 +0000
@@ -1,90 +1,115 @@
-// W25X40BV.cpp
-
-#include"W25X40BV.h"
-
-// CONSTRUCTOR 
-W25X40BV::W25X40BV(PinName mosi, PinName miso, PinName sclk, PinName cs) : _spi(mosi, miso, sclk), _cs(cs) {
-    _spi.format(SPI_NBIT, SPI_MODE);
-    _spi.frequency(SPI_FREQ);
-    chipDisable();
-}
-
-
-// READING
-int W25X40BV::read(int addr) {
-    chipEnable();
-    _spi.write(R_INST);
-    _spi.write((addr & ADDR_BMASK2) >> ADDR_BSHIFT2);
-    _spi.write((addr & ADDR_BMASK1) >> ADDR_BSHIFT1);
-    _spi.write((addr & ADDR_BMASK0) >> ADDR_BSHIFT0);
-    int response = _spi.write(DUMMY_ADDR);
-    chipDisable();
-    return response;
-}
-int W25X40BV::read(int a2, int a1, int a0) {
-   chipEnable();
-   _spi.write(R_INST);
-   _spi.write(a2);
-   _spi.write(a1);
-   _spi.write(a0);
-   int response = _spi.write(DUMMY_ADDR);
-    chipDisable();
-    return response;
-}
-
-
-// WRITING
-void W25X40BV::write(int addr, int data) {
-    writeEnable();
-    chipEnable();
-    _spi.write(W_INST);
-    _spi.write((addr & ADDR_BMASK2) >> ADDR_BSHIFT2);
-    _spi.write((addr & ADDR_BMASK1) >> ADDR_BSHIFT1);
-    _spi.write((addr & ADDR_BMASK0) >> ADDR_BSHIFT0);
-    _spi.write(data);
-    chipDisable();
-    writeDisable();
-    wait(WAIT_TIME);
-}
-void W25X40BV::write(int a2, int a1, int a0, int data) {
-    writeEnable();
-    chipEnable();
-    _spi.write(W_INST);
-    _spi.write(a2);
-    _spi.write(a1);
-    _spi.write(a0);
-    _spi.write(data);
-    chipDisable();
-     writeDisable();
-     wait(WAIT_TIME);
-}
-
-
-//ERASING
-void W25X40BV::chipErase() {
-    writeEnable();
-    chipEnable();
-    _spi.write(C_ERASE_INST);
-    chipDisable();
-    writeDisable();
-    wait(WAIT_TIME);
-}
-    
-
-//ENABLE/DISABLE (private functions)
-void W25X40BV::writeEnable() {
-    chipEnable();
-    _spi.write(WE_INST);
-    chipDisable();
-}
-void W25X40BV::writeDisable() {
-    chipEnable();
-    _spi.write(WD_INST);
-    chipDisable();
-}
-void W25X40BV::chipEnable() {
-    _cs = 0;
-}
-void W25X40BV::chipDisable() {
-    _cs = 1;
+// W25X40BV.cpp
+
+#include"W25X40BV.h"
+
+// CONSTRUCTOR 
+W25X40BV::W25X40BV(PinName mosi, PinName miso, PinName sclk, PinName cs) : _spi(mosi, miso, sclk), _cs(cs) {
+    _spi.format(SPI_NBIT, SPI_MODE);
+    _spi.frequency(SPI_FREQ);
+    chipDisable();
+}
+
+
+// READING
+int W25X40BV::readByte(int addr) {
+    chipEnable();
+    _spi.write(R_INST);
+    _spi.write((addr & ADDR_BMASK2) >> ADDR_BSHIFT2);
+    _spi.write((addr & ADDR_BMASK1) >> ADDR_BSHIFT1);
+    _spi.write((addr & ADDR_BMASK0) >> ADDR_BSHIFT0);
+    int response = _spi.write(DUMMY_ADDR);
+    chipDisable();
+    return response;
+}
+int W25X40BV::readByte(int a2, int a1, int a0) {
+   chipEnable();
+   _spi.write(R_INST);
+   _spi.write(a2);
+   _spi.write(a1);
+   _spi.write(a0);
+   int response = _spi.write(DUMMY_ADDR);
+    chipDisable();
+    return response;
+}
+void W25X40BV::read(int addr, char* buf, int count) {
+    if (count < 1)
+        return;
+    chipEnable();
+    _spi.write(R_INST);
+    _spi.write((addr & ADDR_BMASK2) >> ADDR_BSHIFT2);
+    _spi.write((addr & ADDR_BMASK1) >> ADDR_BSHIFT1);
+    _spi.write((addr & ADDR_BMASK0) >> ADDR_BSHIFT0);
+    for (int i = 0; i < count; i++)
+        buf[i] =  _spi.write(DUMMY_ADDR);
+    chipDisable();
+}
+
+// WRITING
+void W25X40BV::writeByte(int addr, int data) {
+    writeEnable();
+    chipEnable();
+    _spi.write(W_INST);
+    _spi.write((addr & ADDR_BMASK2) >> ADDR_BSHIFT2);
+    _spi.write((addr & ADDR_BMASK1) >> ADDR_BSHIFT1);
+    _spi.write((addr & ADDR_BMASK0) >> ADDR_BSHIFT0);
+    _spi.write(data);
+    chipDisable();
+    writeDisable();
+    wait(WAIT_TIME);
+}
+void W25X40BV::writeByte(int a2, int a1, int a0, int data) {
+    writeEnable();
+    chipEnable();
+    _spi.write(W_INST);
+    _spi.write(a2);
+    _spi.write(a1);
+    _spi.write(a0);
+    _spi.write(data);
+    chipDisable();
+    writeDisable();
+    wait(WAIT_TIME);
+}
+void W25X40BV::write(int addr, char* buf, int count) {
+    if (count < 1)
+        return;
+    writeEnable();
+    chipEnable();
+    _spi.write(W_INST);
+    _spi.write((addr & ADDR_BMASK2) >> ADDR_BSHIFT2);
+    _spi.write((addr & ADDR_BMASK1) >> ADDR_BSHIFT1);
+    _spi.write((addr & ADDR_BMASK0) >> ADDR_BSHIFT0);
+    for (int i = 0; i < count; i++)
+        _spi.write(buf[i]);
+    chipDisable();
+    writeDisable();
+    wait(WAIT_TIME);
+}
+
+//ERASING
+void W25X40BV::chipErase() {
+    writeEnable();
+    chipEnable();
+    _spi.write(C_ERASE_INST);
+    chipDisable();
+    writeDisable();
+    wait(WAIT_TIME);
+}
+    
+
+//ENABLE/DISABLE (private functions)
+void W25X40BV::writeEnable() {
+    chipEnable();
+    _spi.write(WE_INST);
+    chipDisable();
+}
+void W25X40BV::writeDisable() {
+    chipEnable();
+    _spi.write(WD_INST);
+    chipDisable();
+}
+void W25X40BV::chipEnable() {
+    _cs = 0;
+}
+void W25X40BV::chipDisable() {
+    _cs = 1;
 }
\ No newline at end of file