From e8a85b3726c390cb07ede55dfeffd42abaa9411a Mon Sep 17 00:00:00 2001
From: nvt-se <nvt-se>
Date: Fri, 11 Jul 2008 21:35:10 +0000
Subject: [PATCH] moved platform independent code to the right place

---
 core/cfs/cfs-coffee.c          |  6 ++++++
 platform/esb/cfs-coffee-arch.h | 12 +++---------
 platform/sky/cfs-coffee-arch.h | 13 +++----------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index d605ca8b6..45f2a790d 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -91,6 +91,12 @@ struct file_desc {
 #define FD_WRITABLE(fd)		(coffee_fd_set[(fd)].flags & CFS_WRITE)
 #define FD_APPENDABLE(fd)	(coffee_fd_set[(fd)].flags & CFS_APPEND)
 
+#define READ_HEADER(hdr, page)			\
+  COFFEE_READ((hdr), sizeof (*hdr), (page) * COFFEE_PAGE_SIZE)
+
+#define WRITE_HEADER(hdr, page)			\
+  COFFEE_WRITE((hdr), sizeof (*hdr), (page) * COFFEE_PAGE_SIZE)
+
 struct dir_cache {
   char filename_start;
   int32_t page;
diff --git a/platform/esb/cfs-coffee-arch.h b/platform/esb/cfs-coffee-arch.h
index 174e98e44..d9ac2886c 100644
--- a/platform/esb/cfs-coffee-arch.h
+++ b/platform/esb/cfs-coffee-arch.h
@@ -1,6 +1,3 @@
-#ifndef CFS_COFFEE_ARCH_H
-#define CFS_COFFEE_ARCH_H
-
 /*
  * Copyright (c) 2008, Swedish Institute of Computer Science
  * All rights reserved.
@@ -41,6 +38,9 @@
  * 	Niclas Finne <nfi@sics.se>
  */
 
+#ifndef CFS_COFFEE_ARCH_H
+#define CFS_COFFEE_ARCH_H
+
 #include "contiki-conf.h"
 #include "dev/eeprom.h"
 
@@ -66,12 +66,6 @@
 
 #define COFFEE_ERASE(sector) cfs_coffee_arch_erase(sector)
 
-#define READ_HEADER(hdr, page)						\
-  COFFEE_READ((hdr), sizeof (*hdr), (page) * COFFEE_PAGE_SIZE)
-
-#define WRITE_HEADER(hdr, page)						\
-  COFFEE_WRITE((hdr), sizeof (*hdr), (page) * COFFEE_PAGE_SIZE)
-
 void cfs_coffee_arch_erase(uint16_t sector);
 
 #endif /* !COFFEE_ARCH_H */
diff --git a/platform/sky/cfs-coffee-arch.h b/platform/sky/cfs-coffee-arch.h
index 740583563..5d528ffcd 100644
--- a/platform/sky/cfs-coffee-arch.h
+++ b/platform/sky/cfs-coffee-arch.h
@@ -1,6 +1,3 @@
-#ifndef CFS_COFFEE_ARCH_H
-#define CFS_COFFEE_ARCH_H
-
 /*
  * Copyright (c) 2008, Swedish Institute of Computer Science
  * All rights reserved.
@@ -40,6 +37,9 @@
  * 	Nicolas Tsiftes <nvt@sics.se>
  */
 
+#ifndef CFS_COFFEE_ARCH_H
+#define CFS_COFFEE_ARCH_H
+
 #include "contiki-conf.h"
 #include "dev/xmem.h"
 
@@ -52,7 +52,6 @@
 #define COFFEE_NAME_LENGTH		16
 #define COFFEE_DYN_SIZE			(16 kb)
 #define COFFEE_FD_SET_SIZE		8
-#define COFFEE_LOG_DIVISOR		4
 #define COFFEE_LOG_SIZE			(8 kb)
 #define COFFEE_LOG_TABLE_LIMIT		256
 #define COFFEE_DIR_CACHE_ENTRIES	16
@@ -66,10 +65,4 @@
 #define COFFEE_ERASE(sector)					\
   		xmem_erase(COFFEE_SECTOR_SIZE, COFFEE_START + (sector) * COFFEE_SECTOR_SIZE)
 
-#define READ_HEADER(hdr, page)						\
-  COFFEE_READ((hdr), sizeof (*hdr), (page) * COFFEE_PAGE_SIZE)
-
-#define WRITE_HEADER(hdr, page)						\
-  COFFEE_WRITE((hdr), sizeof (*hdr), (page) * COFFEE_PAGE_SIZE)
-
 #endif /* !COFFEE_ARCH_H */