Make backtraces slightly more reliable.

[pintos-anon] / src / devices / disk.h

diff --git a/src/devices/disk.h b/src/devices/disk.h
index 5f89d1de1c3e1048da31484bcbea371f7f8b83e6..3bcbb9a10612d223434bae8b81bd75b72de3d4d4 100644 (file)
--- a/src/devices/disk.h
+++ b/src/devices/disk.h
@@ -1,18 +1,26 @@
-#ifndef HEADER_DISK_H
-#define HEADER_DISK_H 1
+#ifndef DEVICES_DISK_H
+#define DEVICES_DISK_H
 
 #include <inttypes.h>
 #include <stdint.h>
 
+/* Size of a disk sector in bytes. */
 #define DISK_SECTOR_SIZE 512
 
-typedef uint32_t disk_sector_no;
-#define PRDSNu PRId32   /* For use with printk(). */
+/* Index of a disk sector within a disk.
+   Good enough for disks up to 2 TB. */
+typedef uint32_t disk_sector_t;
+
+/* Format specifier for printf(), e.g.:
+   printf ("sector=%"PRDSNu"\n", sector); */
+#define PRDSNu PRIu32
 
 void disk_init (void);
-struct disk *disk_get (int idx);
-disk_sector_no disk_size (struct disk *);
-void disk_read (struct disk *, disk_sector_no, void *);
-void disk_write (struct disk *, disk_sector_no, const void *);
+void disk_print_stats (void);
+
+struct disk *disk_get (int chan_no, int dev_no);
+disk_sector_t disk_size (struct disk *);
+void disk_read (struct disk *, disk_sector_t, void *);
+void disk_write (struct disk *, disk_sector_t, const void *);
 
-#endif /* disk.h */
+#endif /* devices/disk.h */