From 2b7965a1d9342e0050c32905b7fc0faaa5ee4bde Mon Sep 17 00:00:00 2001
From: Laurent Vivier <Laurent@lvivier.info>
Date: Wed, 23 Nov 2005 22:37:27 +0000
Subject: [PATCH] Add get_size() of devices

---
 libstream/libstream.h   |  2 ++
 libstream/stream_open.c | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/libstream/libstream.h b/libstream/libstream.h
index 98a01b9..c340314 100644
--- a/libstream/libstream.h
+++ b/libstream/libstream.h
@@ -19,11 +19,13 @@ typedef int (*stream_lseek_t)(void *data, long offset, int whence);
 typedef int (*stream_close_t)(void *data);
 typedef int (*stream_umount_t)(void *data);
 typedef int (*stream_fstat_t)(void *data, struct stream_stat *buf);
+typedef int (*stream_get_blocksize_t)(void *data);
 
 typedef struct {
 	void *data;
 	stream_read_sector_t read_sector;
 	stream_close_t close;
+	stream_get_blocksize_t get_blocksize;
 } device_io_t;
 
 typedef struct {
diff --git a/libstream/stream_open.c b/libstream/stream_open.c
index c6a191e..07772e8 100644
--- a/libstream/stream_open.c
+++ b/libstream/stream_open.c
@@ -120,7 +120,6 @@ stream_t *stream_open(char *dev)
 
 	switch(device)
 	{
-#if 0
 		case device_FLOPPY:
 			if (partition != -1)
 			{
@@ -135,8 +134,8 @@ stream_t *stream_open(char *dev)
 			}
 			stream->device.read_sector = (stream_read_sector_t)floppy_read_sector;
 			stream->device.close = (stream_close_t)floppy_close;
+			stream->device.get_blocksize = (stream_get_blocksize_t)floppy_get_blocksize; 
 			break;
-#endif
 
 		case device_SCSI:
 			stream->device.data = scsi_open(unit);
@@ -147,6 +146,7 @@ stream_t *stream_open(char *dev)
 			}
 			stream->device.read_sector = (stream_read_sector_t)scsi_read_sector;
 			stream->device.close = (stream_close_t)scsi_close; 
+			stream->device.get_blocksize = (stream_get_blocksize_t)scsi_get_blocksize; 
 			break;
 		default:
 			free(stream);
@@ -156,18 +156,21 @@ stream_t *stream_open(char *dev)
 
 	switch(fs)
 	{
-#if 0
 		case fs_BLOCK:
-			if (stream->fs.data == NULL)
+			stream->fs.volume = NULL;
+			stream->fs.file = block_open(&stream->device, current);
+			if (stream->fs.file == NULL)
 				goto outfs;
 			stream->fs.read = (stream_read_t)block_read;
-			stream->fs.seek = (stream_lseek_t)block_seek;
+			stream->fs.lseek = (stream_lseek_t)block_lseek;
 			stream->fs.close = (stream_close_t)block_close;
-			stream->fs.umount = (stream_umount_t)block_umount;
+			stream->fs.umount = NULL;
 			stream->fs.fstat = (stream_fstat_t)block_fstat;
 			break;
+#if 0
 		case fs_CONTAINER:
-			stream->fs.data = container_open(&stream->device, current);
+			stream->fs.volume = NULL;
+			stream->fs.file = container_open(&stream->device, current);
 			if (stream->fs.data == NULL)
 				goto outfs;
 			stream->fs.read = (stream_read_t)container_read;