pull patches back in from 2.20-2 build

[debian/cpmtools] / device.h

diff --git a/device.h b/device.h
index 19bdf5e47c74fe21a5c4c51512669e005e76eb1b..377e2580f76ccc0ad1b333234d6772a8b4e67294 100644 (file)
--- a/device.h
+++ b/device.h
@@ -15,11 +15,12 @@ struct Device
   int secLength;
   int tracks;
   int sectrk;
-#if HAVE_LIBDSK_H
+  off_t offset;
+#ifdef HAVE_LIBDSK_H
   DSK_PDRIVER   dev;
   DSK_GEOMETRY geom; 
 #endif
-#if HAVE_WINDOWS_H
+#ifdef HAVE_WINDOWS_H
   int drvtype;
   HANDLE hdisk;
 #endif
@@ -27,7 +28,7 @@ struct Device
 };
 
 const char *Device_open(struct Device *self, const char *filename, int mode, const char *deviceOpts);
-void Device_setGeometry(struct Device *self, int secLength, int sectrk, int tracks);
+const char *Device_setGeometry(struct Device *self, int secLength, int sectrk, int tracks, off_t offset, const char *libdskGeometry);
 const char *Device_close(struct Device *self);
 const char *Device_readSector(const struct Device *self, int track, int sector, char *buf);
 const char *Device_writeSector(const struct Device *self, int track, int sector, const char *buf);