Introduced directory app and .DSC files on the Apple2 (and removed conseqently most app descriptions from Contiki menu).
diff --git a/contiki-apple2/Makefile.apple2 b/contiki-apple2/Makefile.apple2
index 0b5b9bf..95179fe 100644
--- a/contiki-apple2/Makefile.apple2
+++ b/contiki-apple2/Makefile.apple2
@@ -30,7 +30,7 @@
#
# This file is part of the Contiki desktop environment
#
-# $Id: Makefile.apple2,v 1.14 2005/05/05 00:14:16 oliverschmidt Exp $
+# $Id: Makefile.apple2,v 1.15 2005/05/06 22:38:17 oliverschmidt Exp $
#
all: contiki
@@ -53,16 +53,8 @@
contiki:crt0.o main.o ek.o ek-service.o timer.o program-handler.o arg.o \
$(CTK) $(UIP) loader-arch.o bank.o kfs.o import.o \
- about-dsc.o \
- calc-dsc.o \
- configedit-dsc.o \
- dhcp-dsc.o \
+ www-dsc.o \
email-dsc.o \
ftp-dsc.o \
- irc-dsc.o \
- memstat-dsc.o \
- processes-dsc.o \
- shell-dsc.o \
- telnet-dsc.o \
- www-dsc.o
+ directory-dsc.o
$(LD) -C apple2.cfg -Ln contiki-labels -m contiki.map $^ $(SYS).lib
diff --git a/contiki-apple2/Makefile.programs b/contiki-apple2/Makefile.programs
index 4f17885..d2067df 100644
--- a/contiki-apple2/Makefile.programs
+++ b/contiki-apple2/Makefile.programs
@@ -27,27 +27,28 @@
#
# This file is part of the Contiki desktop environment
#
-# $Id: Makefile.programs,v 1.14 2005/05/06 00:06:06 oliverschmidt Exp $
+# $Id: Makefile.programs,v 1.15 2005/05/06 22:38:17 oliverschmidt Exp $
#
-all: loader-arch-module.o contiki-labels.o \
- lancegs.drv \
- uther.drv \
- about.prg \
- calc.prg \
+all: loader-arch-module.o loader-arch-dsc.o contiki-labels.o \
+ about.prg about.dsc \
+ calc.prg calc.dsc \
config.prg \
- configedit.prg \
- dhcp.prg \
- email.prg \
- ftp.prg \
- irc.prg \
- memstat.prg \
- processes.prg \
- shell.prg \
- telnet.prg \
+ configedit.prg configedit.dsc \
+ dhcp.prg dhcp.dsc \
+ directory.prg directory.dsc \
+ email.prg email.dsc \
+ ftp.prg ftp.dsc \
+ irc.prg irc.dsc \
+ memstat.prg memstat.dsc \
+ processes.prg processes.dsc \
+ shell.prg shell.dsc \
+ telnet.prg telnet.dsc \
welcome.prg \
- wget.prg \
- www.prg
+ wget.prg wget.dsc \
+ www.prg www.dsc \
+ lancegs.drv lancegs.dsc \
+ uther.drv uther.dsc
SYS=apple2enh
@@ -59,12 +60,10 @@
CFLAGS:=$(CFLAGSCC65) \
-DWITH_ASCII -DWITH_UIP -DWITH_LOADER_ARCH -DWITH_ETHERNET
-lancegs.drv: lancegs-drv.o lan91c96.o uip_arp.o
-
-uther.drv: uther-drv.o cs8900a.o uther-drv-asm.o uip_arp.o
-
configedit.prg: configedit.o ctk-textentry-checkbox.o
+directory.prg: directory.o cfs.o
+
dhcp.prg: $(DHCP) lc-asm.o
email.prg: $(EMAIL) lc-asm.o
@@ -80,3 +79,7 @@
wget.prg: $(WGET)
www.prg: $(WWW)
+
+lancegs.drv: lancegs-drv.o lan91c96.o uip_arp.o
+
+uther.drv: uther-drv.o cs8900a.o uther-drv-asm.o uip_arp.o
diff --git a/contiki-apple2/conf/ctk-conf.h b/contiki-apple2/conf/ctk-conf.h
index e1b1f8e..493b941 100644
--- a/contiki-apple2/conf/ctk-conf.h
+++ b/contiki-apple2/conf/ctk-conf.h
@@ -32,7 +32,7 @@
*
* This file is part of the "ctk" console GUI toolkit for cc65
*
- * $Id: ctk-conf.h,v 1.8 2005/05/05 00:14:38 oliverschmidt Exp $
+ * $Id: ctk-conf.h,v 1.9 2005/05/06 22:39:15 oliverschmidt Exp $
*
*/
@@ -96,7 +96,7 @@
/* Defines the default width of a menu. */
#define CTK_CONF_MENUWIDTH 16
/* The maximum number of menu items in each menu. */
-#define CTK_CONF_MAXMENUITEMS 13
+#define CTK_CONF_MAXMENUITEMS 5
/* Toggles support for screen savers. */
#define CTK_CONF_SCREENSAVER 0
diff --git a/contiki-apple2/conf/program-handler-conf.h b/contiki-apple2/conf/program-handler-conf.h
index 5cd4260..f51530c 100644
--- a/contiki-apple2/conf/program-handler-conf.h
+++ b/contiki-apple2/conf/program-handler-conf.h
@@ -30,11 +30,11 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
- * $Id: program-handler-conf.h,v 1.3 2005/05/05 00:14:38 oliverschmidt Exp $
+ * $Id: program-handler-conf.h,v 1.4 2005/05/06 22:39:15 oliverschmidt Exp $
*/
#ifndef __PROGRAM_HANDLER_CONF_H__
#define __PROGRAM_HANDLER_CONF_H__
-#define PROGRAM_HANDLER_CONF_MAX_NUMDSCS 12
+#define PROGRAM_HANDLER_CONF_MAX_NUMDSCS 4
#endif /* __PROGRAM_HANDLER_CONF_H__ */
diff --git a/contiki-apple2/main.c b/contiki-apple2/main.c
index 36f5814..f9ecc89 100644
--- a/contiki-apple2/main.c
+++ b/contiki-apple2/main.c
@@ -32,7 +32,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: main.c,v 1.11 2005/05/05 00:14:16 oliverschmidt Exp $
+ * $Id: main.c,v 1.12 2005/05/06 22:38:17 oliverschmidt Exp $
*
*/
@@ -47,18 +47,10 @@
#include "resolv.h"
-#include "about-dsc.h"
-#include "calc-dsc.h"
-#include "configedit-dsc.h"
-#include "dhcp-dsc.h"
+#include "www-dsc.h"
#include "email-dsc.h"
#include "ftp-dsc.h"
-#include "irc-dsc.h"
-#include "memstat-dsc.h"
-#include "telnet-dsc.h"
-#include "shell-dsc.h"
-#include "processes-dsc.h"
-#include "www-dsc.h"
+#include "directory-dsc.h"
#include "clock.h"
@@ -115,18 +107,10 @@
program_handler_init();
- program_handler_add(&www_dsc, "Web browser", 1);
- program_handler_add(&email_dsc, "E-mail", 1);
- program_handler_add(&ftp_dsc, "FTP client", 1);
- program_handler_add(&irc_dsc, "IRC client", 1);
- program_handler_add(&telnet_dsc, "Telnet", 0);
- program_handler_add(&dhcp_dsc, "DHCP client", 0);
- program_handler_add(&configedit_dsc, "Configuration", 0);
- program_handler_add(&memstat_dsc, "Memory stats", 0);
- program_handler_add(&processes_dsc, "Processes", 0);
- program_handler_add(&calc_dsc, "Calculator", 0);
- program_handler_add(&shell_dsc, "Command shell", 0);
- program_handler_add(&about_dsc, "About Contiki", 0);
+ program_handler_add(&www_dsc, "Web browser", 1);
+ program_handler_add(&email_dsc, "E-mail", 1);
+ program_handler_add(&ftp_dsc, "FTP client", 1);
+ program_handler_add(&directory_dsc, "Directory", 1);
while(1) {
if(ek_run() == 0) {
diff --git a/contiki-apple2/readme.txt b/contiki-apple2/readme.txt
index 6e9d98f..3d2f261 100644
--- a/contiki-apple2/readme.txt
+++ b/contiki-apple2/readme.txt
@@ -18,23 +18,40 @@
a2 in b dos33.dsk CONTIKI.SYSTEM loader~1.sys
a2 in -r b dos33.dsk CONTIKI contiki
- a2 in b.0000 dos33.dsk LANCEGS.DRV lancegs.drv
- a2 in b.0000 dos33.dsk TFE.DRV tfe.drv
a2 in b.0000 dos33.dsk ABOUT.PRG about.prg
+ a2 in b.0000 dos33.dsk ABOUT.DSC about.dsc
a2 in b.0000 dos33.dsk CALC.PRG calc.prg
+ a2 in b.0000 dos33.dsk CALC.DSC calc.dsc
a2 in b.0000 dos33.dsk CONFIG.PRG config.prg
a2 in b.0000 dos33.dsk CONFIGEDIT.PRG config~1.prg
- a2 in b.0000 dos33.dsk EMAIL.PRG email.prg
+ a2 in b.0000 dos33.dsk CONFIGEDIT.DSC config~1.dsc
a2 in b.0000 dos33.dsk DHCP.PRG dhcp.prg
+ a2 in b.0000 dos33.dsk DHCP.DSC dhcp.dsc
+ a2 in b.0000 dos33.dsk DIRECTORY.PRG direct~1.prg
+ a2 in b.0000 dos33.dsk DIRECTORY.DSC direct~1.dsc
+ a2 in b.0000 dos33.dsk EMAIL.PRG email.prg
+ a2 in b.0000 dos33.dsk EMAIL.DSC email.dsc
a2 in b.0000 dos33.dsk FTP.PRG ftp.prg
+ a2 in b.0000 dos33.dsk FTP.DSC ftp.dsc
a2 in b.0000 dos33.dsk IRC.PRG irc.prg
+ a2 in b.0000 dos33.dsk IRC.DSC irc.dsc
a2 in b.0000 dos33.dsk MEMSTAT.PRG memstat.prg
+ a2 in b.0000 dos33.dsk MEMSTAT.DSC memstat.dsc
a2 in b.0000 dos33.dsk PROCESSES.PRG proces~1.prg
+ a2 in b.0000 dos33.dsk PROCESSES.DSC proces~1.dsc
a2 in b.0000 dos33.dsk SHELL.PRG shell.prg
+ a2 in b.0000 dos33.dsk SHELL.DSC shell.dsc
a2 in b.0000 dos33.dsk TELNET.PRG telnet.prg
+ a2 in b.0000 dos33.dsk TELNET.DSC telnet.dsc
a2 in b.0000 dos33.dsk WELCOME.PRG welcome.prg
a2 in b.0000 dos33.dsk WGET.PRG wget.prg
+ a2 in b.0000 dos33.dsk WGET.DSC wget.dsc
a2 in b.0000 dos33.dsk WWW.PRG www.prg
+ a2 in b.0000 dos33.dsk WWW.DSC www.dsc
+ a2 in b.0000 dos33.dsk LANCEGS.DRV lancegs.drv
+ a2 in b.0000 dos33.dsk LANCEGS.DSC lancegs.dsc
+ a2 in b.0000 dos33.dsk UTHER.DRV uther.drv
+ a2 in b.0000 dos33.dsk UTHER.DSC uther.dsc
4. Use any ProDOS 8 file utility program capable of reading DOS 3.3 files to