From 4fd4cb1238ae99e0bef3ea62d95db777e21e8da8 Mon Sep 17 00:00:00 2001
From: nvt-se <nvt-se>
Date: Thu, 17 Sep 2009 14:37:32 +0000
Subject: [PATCH] Architecture-dependent Coffee functions for SD cards.

---
 platform/msb430/cfs-coffee-arch.c | 65 +++++++++++++++++++++++++++++++
 platform/msb430/cfs-coffee-arch.h |  7 +++-
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 platform/msb430/cfs-coffee-arch.c

diff --git a/platform/msb430/cfs-coffee-arch.c b/platform/msb430/cfs-coffee-arch.c
new file mode 100644
index 000000000..4690291b9
--- /dev/null
+++ b/platform/msb430/cfs-coffee-arch.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2009, 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.
+ *
+ */
+
+/**
+ * \file
+ *	Coffee functions the MSB-430 platform.
+ * \author
+ * 	Nicolas Tsiftes <nvt@sics.se>
+ */
+
+#include "cfs-coffee-arch.h"
+#include "dev/sd.h"
+
+#include <string.h>
+
+int
+cfs_coffee_arch_erase(unsigned sector)
+{
+  char buf[SD_BLOCK_SIZE];
+  sd_offset_t start_offset;
+  sd_offset_t end_offset;
+  sd_offset_t offset;
+  int r;
+
+  memset(buf, 0, sizeof(buf));
+
+  start_offset = COFFEE_START + sector * COFFEE_SECTOR_SIZE;
+  end_offset = start_offset + COFFEE_SECTOR_SIZE;
+
+  for(offset = start_offset; offset < end_offset; offset += SD_BLOCK_SIZE) {
+    if(sd_rio_write(offset, buf, sizeof(buf)) < 0) {
+      return -1;
+    }
+  }
+  return 0;
+}
diff --git a/platform/msb430/cfs-coffee-arch.h b/platform/msb430/cfs-coffee-arch.h
index fb2e926cc..d03f436c0 100644
--- a/platform/msb430/cfs-coffee-arch.h
+++ b/platform/msb430/cfs-coffee-arch.h
@@ -32,7 +32,7 @@
 
 /**
  * \file
- *	Coffee architecture-dependent header for the Tmote Sky platform.
+ *	Coffee header for the Tmote Sky platform.
  * \author
  * 	Nicolas Tsiftes <nvt@sics.se>
  */
@@ -64,10 +64,13 @@
 #define COFFEE_READ(buf, size, offset)				\
   		sd_rio_read(COFFEE_START + (offset), (char *)buf, (size))
 
-#define COFFEE_ERASE(sector)
+#define COFFEE_ERASE(sector)					\
+		cfs_coffee_arch_erase(sector)
 
 /* Coffee types. */
 typedef int16_t coffee_page_t;
 typedef sd_offset_t coffee_offset_t;
 
+int cfs_coffee_arch_erase(unsigned);
+
 #endif /* !COFFEE_ARCH_H */