--- a/packages/io/common/current/ChangeLog
+++ b/packages/io/common/current/ChangeLog
@@ -1,11 +1,16 @@
-2006-02-15  Uwe Kindler  <uwe_kindler@web.de>
-
-	* include/config_keys.h Replaced CAN configuration keys
-	CYG_IO_SET_CONFIG_CAN_REMOTE_BUF, 
-	CYG_IO_SET_CONFIG_CAN_FILTER_ALL and
-	CYG_IO_SET_CONFIG_CAN_FILTER_MSG with new single config key
-	CYG_IO_SET_CONFIG_CAN_MSGBUF
-
+2006-09-21  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* include/config_keys.h: Merge from eCosCentric repository.
+	ChangeLogs incorporated in correct location below.
+
+2006-02-15  Uwe Kindler  <uwe_kindler@web.de>
+
+	* include/config_keys.h Replaced CAN configuration keys
+	CYG_IO_SET_CONFIG_CAN_REMOTE_BUF, 
+	CYG_IO_SET_CONFIG_CAN_FILTER_ALL and
+	CYG_IO_SET_CONFIG_CAN_FILTER_MSG with new single config key
+	CYG_IO_SET_CONFIG_CAN_MSGBUF
+
 2005-12-02  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* src/iosys.c: 
@@ -16,6 +21,10 @@ 2005-09-11  Uwe Kindler  <uwe_kindler@we
 
 	* include/config_keys.h Configuration keys for CAN driver added. 
 	
+2005-01-19  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* include/config_keys.h: Add device close key.
+
 2004-12-23  Peter Korsgaard  <jacmet@sunsite.dk>
 
 	* doc/io.sgml: Match CYG_TTY_IN_FLAGS_ECHO and
@@ -31,7 +40,12 @@ 2004-04-16  Jonathan Larmour  <jifl@eCos
 	* src/iosys.c (cyg_io_lookup): Use union to avoid aliasing problems
 	with compiler.
 
-2004-01-19  Nick Garnett  <nickg@calivar.com>
+2004-04-15  Nick Garnett  <nickg@ecoscentric.com>
+
+	* include/config_keys.h: Added CYG_IO_SET_CONFIG_DISK_MOUNT and
+	CYG_IO_SET_CONFIG_DISK_UMOUNT keys.
+
+2004-01-19  Nick Garnett  <nickg@ecoscentric.com>
 
 	* include/config_keys.h (CYG_IO_GET_CONFIG_DISK_INFO): Added DISK
 	IO config key base definition.
@@ -255,6 +269,7 @@ 1999-02-25  Gary Thomas  <gthomas@cygnus
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2004, 2006 eCosCentric Limited
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free

--- a/packages/io/common/current/include/config_keys.h
+++ b/packages/io/common/current/include/config_keys.h
@@ -11,6 +11,7 @@
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2004 eCosCentric Limited
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
@@ -128,6 +129,8 @@
 
 #define CYG_IO_GET_CONFIG_DISK_INFO              0x700
 
+#define CYG_IO_SET_CONFIG_DISK_MOUNT             0x781
+#define CYG_IO_SET_CONFIG_DISK_UMOUNT            0x782
 
 // ======== 0x800 CAN ========================================================
 // Get/Set configuration 'key' values for CAN I/O 
@@ -143,10 +146,9 @@
 #define CYG_IO_SET_CONFIG_CAN_OUTPUT_FLUSH          0x0883
 #define CYG_IO_SET_CONFIG_CAN_INPUT_FLUSH           0x0884
 #define CYG_IO_SET_CONFIG_CAN_TIMEOUT               0x0885
-#define CYG_IO_SET_CONFIG_CAN_MSGBUF                0x0886
+#define CYG_IO_SET_CONFIG_CAN_MSGBUF                0x0886
 #define CYG_IO_SET_CONFIG_CAN_MODE                  0x0887
-#define CYG_IO_SET_CONFIG_CAN_ABORT                 0x0888
-
+#define CYG_IO_SET_CONFIG_CAN_ABORT                 0x0888
 
 
 // ======== 0x1000 Generic ===================================================
@@ -159,6 +161,11 @@
 #define CYG_IO_SET_CONFIG_READ_BLOCKING         0x1081
 #define CYG_IO_SET_CONFIG_WRITE_BLOCKING        0x1082
 
+// Close the underlying device - primarily useful for io/fileio's devfs,
+// but probably more widely applicable. Note that this is not like UNIX
+// close in that there is no reference counting. If that is needed it must
+// be done at a higher level.
+#define CYG_IO_SET_CONFIG_CLOSE                 0x1100
 
 #endif  /* CYGONCE_CONFIG_KEYS_H */
 /* EOF config_keys.h */