]> Zhao Yanbai Git Server - minix.git/commitdiff
Add DEV_CLONE_A dev type
authorThomas Veerman <thomas@minix3.org>
Wed, 27 Jul 2011 12:23:03 +0000 (12:23 +0000)
committerThomas Veerman <thomas@minix3.org>
Wed, 27 Jul 2011 12:23:03 +0000 (12:23 +0000)
commands/service/service.c
common/include/minix/com.h
common/include/minix/dmap.h
servers/is/dmp_fs.c
servers/rs/table.c
servers/vfs/dmap.c

index 04b4c565d76915f8ab2894ae87933b43cd9651b5..0eab47002944808902ff39993603f49815479360 100644 (file)
@@ -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;
index 1ae66b6fe867b35f5fb3ac040024ad524e0b1cef..9aa046f43cf14cb7e60851c3ff1845f03ffa1abc 100644 (file)
 #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)
 
index 3b1cd889013c026b4de346ac506ad4df8075120d..e68936d1b8c9a5c563c96d02b132c7ad3502d31c 100644 (file)
@@ -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                      *
index b721ba19fb8d135703842c468942044f94f435c6..aba188dd97f7fb61cd45a25097249a4f18f336ab 100644 (file)
@@ -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;
        }
 
index f7b0a92a7770467e42e2c6bc57c706331fc59fb1..35f1134f56f444afe4fc34d3495f18013d232663 100644 (file)
@@ -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
                                                                       */
index cae93fa34fa90e9c1a4d6c11063e32e64c4458d9..42bc03743b6bed15dd94d6d8101b883d976b3a88 100644 (file)
@@ -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;