Implemented cfs_opendir() and friends for CBMs based on cc65's cbm_opendir() and friends.

cpu/6502/Makefile.6502

@@ -30,7 +30,7 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile.6502,v 1.33 2010/10/23 08:17:45 oliverschmidt Exp $
+# $Id: Makefile.6502,v 1.34 2010/10/23 13:48:06 oliverschmidt Exp $
 #
 
 ifndef CC65_HOME
@@ -39,7 +39,7 @@ endif
 
 all: cs8900a.eth lan91c96.eth
 
-CONTIKI_TARGET_DIRS = . lib sys
+CONTIKI_TARGET_DIRS = . lib sys cfs
 CONTIKI_CPU_DIRS    = . lib sys ctk net
 
 CONTIKI_TARGET_SOURCEFILES += contiki-main.c

platform/c128/Makefile.c128

@@ -30,10 +30,10 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile.c128,v 1.14 2010/10/23 08:17:45 oliverschmidt Exp $
+# $Id: Makefile.c128,v 1.15 2010/10/23 13:48:06 oliverschmidt Exp $
 #
 
-CONTIKI_TARGET_SOURCEFILES += pfs.S pfs_write.S
+CONTIKI_TARGET_SOURCEFILES += cfs-cbm-dir.c pfs.S pfs_write.S
 
 CONTIKI_CPU = $(CONTIKI)/cpu/6502
 include $(CONTIKI_CPU)/Makefile.6502

platform/c128/cfs/cfs-cbm-dir.c

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2010, 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.
+ * 
+ * Author: Oliver Schmidt <ol.sc@web.de>
+ *
+ * $Id: cfs-cbm-dir.c,v 1.1 2010/10/23 13:48:06 oliverschmidt Exp $
+ */
+
+#include <string.h>
+#include <cbm.h>
+
+#include "contiki.h"
+
+#include "cfs/cfs.h"
+
+/*---------------------------------------------------------------------------*/
+int
+cfs_opendir(struct cfs_dir *p, const char *n)
+{
+  return cbm_opendir(12, _curunit);
+}
+/*---------------------------------------------------------------------------*/
+int
+cfs_readdir(struct cfs_dir *p, struct cfs_dirent *e)
+{
+  struct cbm_dirent dirent;
+
+  if(cbm_readdir(12, &dirent)) {
+    return -1;
+  }
+  strcpy(e->name, dirent.name);
+  e->size = dirent.size;
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+void
+cfs_closedir(struct cfs_dir *p)
+{
+  cbm_closedir(12);
+}
+/*---------------------------------------------------------------------------*/

platform/c128/contiki-conf.h

@@ -30,7 +30,7 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-conf.h,v 1.16 2010/10/23 08:17:45 oliverschmidt Exp $
+ * $Id: contiki-conf.h,v 1.17 2010/10/23 13:48:06 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
@@ -46,10 +46,6 @@
 #define MOUSE_CONF_XTOC(x) ((x) / 4)
 #define MOUSE_CONF_YTOC(y) ((y) / 8)
 
-#define cfs_opendir(dir, name)  0
-#define cfs_readdir(dir, entry) -1
-#define cfs_closedir(dir)
-
 #define BORDERCOLOR       COLOR_BLACK
 #define SCREENCOLOR       COLOR_BLACK
 #define BACKGROUNDCOLOR   COLOR_BLACK

platform/c64/Makefile.c64

@@ -30,10 +30,10 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile.c64,v 1.16 2010/10/23 08:17:45 oliverschmidt Exp $
+# $Id: Makefile.c64,v 1.17 2010/10/23 13:48:06 oliverschmidt Exp $
 #
 
-CONTIKI_TARGET_SOURCEFILES += pfs.S pfs_write.S
+CONTIKI_TARGET_SOURCEFILES += cfs-cbm-dir.c pfs.S pfs_write.S
 
 CONTIKI_CPU = $(CONTIKI)/cpu/6502
 include $(CONTIKI_CPU)/Makefile.6502

platform/c64/cfs/cfs-cbm-dir.c

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2010, 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.
+ * 
+ * Author: Oliver Schmidt <ol.sc@web.de>
+ *
+ * $Id: cfs-cbm-dir.c,v 1.1 2010/10/23 13:48:06 oliverschmidt Exp $
+ */
+
+#include <string.h>
+#include <cbm.h>
+
+#include "contiki.h"
+
+#include "cfs/cfs.h"
+
+/*---------------------------------------------------------------------------*/
+int
+cfs_opendir(struct cfs_dir *p, const char *n)
+{
+  return cbm_opendir(12, _curunit);
+}
+/*---------------------------------------------------------------------------*/
+int
+cfs_readdir(struct cfs_dir *p, struct cfs_dirent *e)
+{
+  struct cbm_dirent dirent;
+
+  if(cbm_readdir(12, &dirent)) {
+    return -1;
+  }
+  strcpy(e->name, dirent.name);
+  e->size = dirent.size;
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+void
+cfs_closedir(struct cfs_dir *p)
+{
+  cbm_closedir(12);
+}
+/*---------------------------------------------------------------------------*/

platform/c64/contiki-conf.h

@@ -30,7 +30,7 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-conf.h,v 1.26 2010/10/23 08:17:45 oliverschmidt Exp $
+ * $Id: contiki-conf.h,v 1.27 2010/10/23 13:48:06 oliverschmidt Exp $
  */
 
 #ifndef __CONTIKI_CONF_H__
@@ -46,10 +46,6 @@
 #define MOUSE_CONF_XTOC(x) ((x) / 8)
 #define MOUSE_CONF_YTOC(y) ((y) / 8)
 
-#define cfs_opendir(dir, name)  0
-#define cfs_readdir(dir, entry) -1
-#define cfs_closedir(dir)
-
 #define BORDERCOLOR       COLOR_BLACK
 #define SCREENCOLOR       COLOR_BLACK
 #define BACKGROUNDCOLOR   COLOR_BLACK