From: Thomas Veerman <thomas@minix3.org>
Date: Wed, 27 Jul 2011 12:23:03 +0000 (+0000)
Subject: Add DEV_CLONE_A dev type
X-Git-Tag: v3.2.0~404
X-Git-Url: http://zhaoyanbai.com/repos//%22https:/www.google.com/jsapi/%22?a=commitdiff_plain;h=ece4c9d565cc84b683af3682f92ab9ab89036d75;p=minix.git

Add DEV_CLONE_A dev type
---

diff --git a/commands/service/service.c b/commands/service/service.c
index 04b4c565d..0eab47002 100644
--- a/commands/service/service.c
+++ b/commands/service/service.c
@@ -334,9 +334,9 @@ PRIVATE int parse_arguments(int argc, char **argv)
 		  }
           else if (strcmp(argv[i], ARG_DEVSTYLE)==0) {
               char* dev_style_keys[] = { "STYLE_DEV", "STYLE_DEVA", "STYLE_TTY",
-                  "STYLE_CTTY", "STYLE_CLONE", NULL };
+                  "STYLE_CTTY", "STYLE_CLONE", "STYLE_CLONE_A", NULL };
               int dev_style_values[] = { STYLE_DEV, STYLE_DEVA, STYLE_TTY,
-                  STYLE_CTTY, STYLE_CLONE };
+                  STYLE_CTTY, STYLE_CLONE, STYLE_CLONE_A };
               for(j=0;dev_style_keys[j]!=NULL;j++) {
                   if(!strcmp(dev_style_keys[j], argv[i+1])) {
                       break;
diff --git a/common/include/minix/com.h b/common/include/minix/com.h
index 1ae66b6fe..9aa046f43 100644
--- a/common/include/minix/com.h
+++ b/common/include/minix/com.h
@@ -217,6 +217,7 @@
 #define DEV_CLOSE_REPL	(DEV_RS_BASE + 6) /* reply to DEV_CLOSE */
 #define DEV_SEL_REPL1	(DEV_RS_BASE + 7) /* first reply to DEV_SELECT */
 #define DEV_SEL_REPL2	(DEV_RS_BASE + 8) /* (opt) second reply to DEV_SELECT */
+#define DEV_OPEN_REPL	(DEV_RS_BASE + 9) /* reply to DEV_OPEN */
 
 #define IS_DEV_RS(type) (((type) & ~0xff) == DEV_RS_BASE)
 
diff --git a/common/include/minix/dmap.h b/common/include/minix/dmap.h
index 3b1cd8890..e68936d1b 100644
--- a/common/include/minix/dmap.h
+++ b/common/include/minix/dmap.h
@@ -5,8 +5,8 @@
 #include <minix/ipc.h>
 
 enum dev_style { STYLE_NDEV, STYLE_DEV, STYLE_DEVA, STYLE_TTY, STYLE_CTTY,
-	STYLE_CLONE };
-#define IS_DEV_STYLE(s) (s>=STYLE_NDEV && s<=STYLE_CLONE)
+	STYLE_CLONE, STYLE_CLONE_A };
+#define IS_DEV_STYLE(s) (s>=STYLE_NDEV && s<=STYLE_CLONE_A)
 
 /*===========================================================================*
  *               	 Major and minor device numbers  		     *
diff --git a/servers/is/dmp_fs.c b/servers/is/dmp_fs.c
index b721ba19f..aba188dd9 100644
--- a/servers/is/dmp_fs.c
+++ b/servers/is/dmp_fs.c
@@ -76,6 +76,7 @@ PRIVATE char * dmap_style(int dev_style)
 	case STYLE_TTY:    strcpy(str, "STYLE_TTY"); break;
 	case STYLE_CTTY:   strcpy(str, "STYLE_CTTY"); break;
 	case STYLE_CLONE:  strcpy(str, "STYLE_CLONE"); break;
+	case STYLE_CLONE_A:  strcpy(str, "STYLE_CLONE_A"); break;
 	default:           strcpy(str, "UNKNOWN"); break;
 	}
 
diff --git a/servers/rs/table.c b/servers/rs/table.c
index f7b0a92a7..35f1134f5 100644
--- a/servers/rs/table.c
+++ b/servers/rs/table.c
@@ -48,7 +48,7 @@ PUBLIC struct boot_image_dev boot_image_dev_table[] = {
   { TTY_PROC_NR,     SRV_DF,  TTY_MAJOR,    STYLE_TTY,  STYLE_CTTY },
   { MEM_PROC_NR,     SRV_DF,  MEMORY_MAJOR, STYLE_DEV,  STYLE_NDEV },
   { LOG_PROC_NR,     SRV_DF,  LOG_MAJOR,    STYLE_DEVA, STYLE_NDEV },
-  { PFS_PROC_NR,     SRV_DF,  UDS_MAJOR,    STYLE_CLONE,STYLE_NDEV },
+  { PFS_PROC_NR,     SRV_DF,  UDS_MAJOR,    STYLE_CLONE_A,STYLE_NDEV },
   { DEFAULT_BOOT_NR, SRV_DF,  0,            STYLE_NDEV, STYLE_NDEV } /* default
                                                                       * entry
                                                                       */
diff --git a/servers/vfs/dmap.c b/servers/vfs/dmap.c
index cae93fa34..42bc03743 100644
--- a/servers/vfs/dmap.c
+++ b/servers/vfs/dmap.c
@@ -143,6 +143,7 @@ int flags;			/* device flags */
 	dp->dmap_io = ctty_io;
 	break;
   case STYLE_CLONE:
+  case STYLE_CLONE_A:
 	dp->dmap_opcl = clone_opcl;
 	dp->dmap_io = gen_io;
 	break;