From fc34a4572b9acd92e2b4be7a3f68cf36e910e6a2 Mon Sep 17 00:00:00 2001 From: nvt-se Date: Tue, 22 Sep 2009 16:31:36 +0000 Subject: [PATCH] Removed the deprecated COFFEE_DIR_CACHE_ENTRIES parameter. --- platform/avr-raven/cfs-coffee-arch.h | 2 -- platform/msb430/cfs-coffee-arch.h | 1 - platform/native/cfs-coffee-arch.h | 2 -- tools/coffee-manager/se/sics/coffee/CoffeeConfiguration.java | 3 +-- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/platform/avr-raven/cfs-coffee-arch.h b/platform/avr-raven/cfs-coffee-arch.h index 853c60784..163b9ec01 100644 --- a/platform/avr-raven/cfs-coffee-arch.h +++ b/platform/avr-raven/cfs-coffee-arch.h @@ -83,7 +83,6 @@ #define COFFEE_MAX_OPEN_FILES 4 #define COFFEE_FD_SET_SIZE 8 #define COFFEE_LOG_TABLE_LIMIT 16 -#define COFFEE_DIR_CACHE_ENTRIES 1 #define COFFEE_DYN_SIZE (COFFEE_PAGE_SIZE * 4) #define COFFEE_LOG_SIZE 128 @@ -132,7 +131,6 @@ void avr_eeprom_erase(uint16_t sector); #define COFFEE_MAX_OPEN_FILES 4 #define COFFEE_FD_SET_SIZE 8 #define COFFEE_LOG_TABLE_LIMIT 16 -#define COFFEE_DIR_CACHE_ENTRIES 1 #define COFFEE_DYN_SIZE (COFFEE_PAGE_SIZE*1) #define COFFEE_MICRO_LOGS 0 #define COFFEE_LOG_SIZE 128 diff --git a/platform/msb430/cfs-coffee-arch.h b/platform/msb430/cfs-coffee-arch.h index 995904f01..6c1b960a0 100644 --- a/platform/msb430/cfs-coffee-arch.h +++ b/platform/msb430/cfs-coffee-arch.h @@ -52,7 +52,6 @@ #define COFFEE_MAX_OPEN_FILES 6 #define COFFEE_FD_SET_SIZE 8 #define COFFEE_LOG_TABLE_LIMIT 256 -#define COFFEE_DIR_CACHE_ENTRIES 16 #define COFFEE_DYN_SIZE 32*1024UL #define COFFEE_LOG_SIZE 8*1024UL #define COFFEE_MICRO_LOGS 0 diff --git a/platform/native/cfs-coffee-arch.h b/platform/native/cfs-coffee-arch.h index 5e0c85aaa..763e1ebae 100644 --- a/platform/native/cfs-coffee-arch.h +++ b/platform/native/cfs-coffee-arch.h @@ -54,8 +54,6 @@ #define COFFEE_LOG_DIVISOR 4 #define COFFEE_LOG_SIZE 8192 #define COFFEE_LOG_TABLE_LIMIT 256 -#define COFFEE_DIR_CACHE_ENTRIES 16 - #define COFFEE_MICRO_LOGS 0 #define COFFEE_WRITE(buf, size, offset) \ diff --git a/tools/coffee-manager/se/sics/coffee/CoffeeConfiguration.java b/tools/coffee-manager/se/sics/coffee/CoffeeConfiguration.java index 787def66a..37554c5d2 100644 --- a/tools/coffee-manager/se/sics/coffee/CoffeeConfiguration.java +++ b/tools/coffee-manager/se/sics/coffee/CoffeeConfiguration.java @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: CoffeeConfiguration.java,v 1.4 2009/08/11 17:03:59 fros4943 Exp $ + * $Id: CoffeeConfiguration.java,v 1.5 2009/09/22 16:31:36 nvt-se Exp $ * * @author Nicolas Tsiftes * @@ -45,7 +45,6 @@ public class CoffeeConfiguration { public static final int FD_SET_SIZE = 256; public static final int MAX_OPEN_FILES = 256; public static final int LOG_TABLE_LIMIT = 256; - public static final int DIR_CACHE_ENTRIES = 256; public static final int NAME_LENGTH = 16; public static int fsSize, sectorSize, pageSize; public static int startOffset, pageTypeSize;