[eros-cvs] cvs commit: eros/src/base/cross/lib/erosimg Volume.cxx Volume.hxx

[Charlie Landau]

clandau     01/01/28 23:08:50

  Modified:    src/base/cross/bin/lsvol dbvol.cxx
               src/base/cross/bin/sysgen sysgen.cxx
               src/base/cross/lib/erosimg Volume.cxx Volume.hxx
  Log:
  Remove some capability page stuff.
  This eliminates the need to convert Volume.cxx to use void keys.

Revision  Changes    Path
1.43      +3 -1      eros/src/base/cross/bin/lsvol/dbvol.cxx

Index: dbvol.cxx
===================================================================
RCS file: /cvs/eros/src/base/cross/bin/lsvol/dbvol.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- dbvol.cxx	2001/01/08 21:47:55	1.42
+++ dbvol.cxx	2001/01/29 04:08:50	1.43
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998, 1999, Jonathan S. Shapiro.
+ * Copyright (C) 1998, 1999, 2001, Jonathan S. Shapiro.
  *
  * This file is part of the EROS Operating System.
  *
@@ -232,6 +232,7 @@
     Diag::printf("...\n");
     Diag::printf("\n");
   }
+#if 0 /* no cap pages */
   else if (Parse::MatchStart(rest, buf) &&
 	   Parse::MatchKeyword(rest, "cp") &&
 	   Parse::MatchOIDVal(rest, oid) &&
@@ -260,6 +261,7 @@
       Diag::printf("\n");
     }
   }
+#endif /* no cap pages */
   else if (Parse::MatchStart(rest, buf) &&
 	   Parse::MatchKeyword(rest, "v") &&
 	   Parse::MatchEOL(rest) ) {



1.48      +5 -1      eros/src/base/cross/bin/sysgen/sysgen.cxx

Index: sysgen.cxx
===================================================================
RCS file: /cvs/eros/src/base/cross/bin/sysgen/sysgen.cxx,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sysgen.cxx	2001/01/08 21:47:55	1.47
+++ sysgen.cxx	2001/01/29 04:08:50	1.48
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998, 1999, Jonathan S. Shapiro.
+ * Copyright (C) 1998, 1999, 2001, Jonathan S. Shapiro.
  *
  * This file is part of the EROS Operating System.
  *
@@ -166,7 +166,9 @@
   uint32_t nPages = image.nPages;
   uint32_t nZeroPages = image.nZeroPages;
   uint32_t nCapPages = image.nCapPages;
+#if 0
   uint32_t nZeroCapPages = image.nZeroCapPages;
+#endif
   uint32_t nNodes = image.nNodes;
   uint32_t nThread = image.nThread;
   DiskKey key;
@@ -253,6 +255,7 @@
 #endif
   }
 
+#if 0 /* no cap pages */
   /* Write the contentful capability pages: */
   for (uint32_t ndx = 0; ndx < nCapPages; ndx++) {
     DiskKey kbuf[EROS_PAGE_SIZE/sizeof(DiskKey)];
@@ -282,6 +285,7 @@
       fprintf(map_file, "image zcpage ndx 0x%lx => disk page oid 0x%08lx%08lx\n",
 	      ndx, (uint32_t) (oid >> 32), (uint32_t) oid);
   }
+#endif /* no cap pages */
 
   for (uint32_t ndx = 0; ndx < nThread; ndx++) {
     ErosImage::Directory d;



1.76      +3 -1      eros/src/base/cross/lib/erosimg/Volume.cxx

Index: Volume.cxx
===================================================================
RCS file: /cvs/eros/src/base/cross/lib/erosimg/Volume.cxx,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Volume.cxx	2001/01/19 11:00:18	1.75
+++ Volume.cxx	2001/01/29 04:08:50	1.76
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1998, 1999, Jonathan S. Shapiro.
+ * Copyright (C) 1998, 1999, 2001, Jonathan S. Shapiro.
  *
  * This file is part of the EROS Operating System.
  *
@@ -1482,6 +1482,7 @@
   return true;
 }
 
+#if 0 /* no cap pages */
 /* FIX: This has a bad bug, in that it checks the page pot before it
  * checks the log entry.
  */
@@ -1635,6 +1636,7 @@
 
   return true;
 }
+#endif /* no cap pages */
 
 /* Log I/O support: */
 bool



1.48      +1 -4      eros/src/base/cross/lib/erosimg/Volume.hxx

Index: Volume.hxx
===================================================================
RCS file: /cvs/eros/src/base/cross/lib/erosimg/Volume.hxx,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Volume.hxx	2001/01/08 21:17:46	1.47
+++ Volume.hxx	2001/01/29 04:08:50	1.48
@@ -1,7 +1,7 @@
 #ifndef __VOLUME_HXX__
 #define __VOLUME_HXX__
 /*
- * Copyright (C) 1998, 1999, Jonathan S. Shapiro.
+ * Copyright (C) 1998, 1999, 2001, Jonathan S. Shapiro.
  *
  * This file is part of the EROS Operating System.
  *
@@ -209,9 +209,6 @@
   /* object I/O.  All of this assumes allocation/call count of 0! */
   bool ReadDataPage(const OID& oid, uint8_t* buf);
   bool WriteDataPage(const OID& oid, const uint8_t* buf);
-
-  bool ReadCapPage(const OID& oid, DiskKey* buf);
-  bool WriteCapPage(const OID& oid, const DiskKey* buf);
 
   bool ReadNode(const OID& oid, DiskNode& node);
   bool WriteNode(const OID& oid, const DiskNode& node);