diff options
| author | Karel Zak | 2012-06-15 13:01:51 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-06-15 13:01:51 +0200 |
| commit | aa323539cfa22424db97baddcdb9cffae2089b0f (patch) | |
| tree | 50cafa4a6b40dc65644c020509bf4095af75e624 /include/blkdev.h | |
| parent | Merge branch '2012wk23' of git://github.com/kerolasa/lelux-utiliteetit (diff) | |
| download | kernel-qcow2-util-linux-aa323539cfa22424db97baddcdb9cffae2089b0f.tar.gz kernel-qcow2-util-linux-aa323539cfa22424db97baddcdb9cffae2089b0f.tar.xz kernel-qcow2-util-linux-aa323539cfa22424db97baddcdb9cffae2089b0f.zip | |
include/blkdev: cleanup up
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'include/blkdev.h')
| -rw-r--r-- | include/blkdev.h | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/include/blkdev.h b/include/blkdev.h index 84c26dd33..8fca522c0 100644 --- a/include/blkdev.h +++ b/include/blkdev.h @@ -62,8 +62,14 @@ # define FITHAW _IOWR('X', 120, int) /* Thaw */ # endif +/* uniform CD-ROM information */ +# ifndef CDROM_GET_CAPABILITY +# define CDROM_GET_CAPABILITY 0x5331 +# endif + #endif /* __linux */ + #ifdef APPLE_DARWIN # define BLKGETSIZE DKIOCGETBLOCKCOUNT32 #endif @@ -73,36 +79,14 @@ # define HDIO_GETGEO 0x0301 # endif -/* uniform CD-ROM information */ -#ifndef CDROM_GET_CAPABILITY -# define CDROM_GET_CAPABILITY 0x5331 -#endif - -/* SCSI device types. Copied almost as-is from kernel header. - * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=blob;f=include/scsi/scsi.h */ -#define SCSI_TYPE_DISK 0x00 -#define SCSI_TYPE_TAPE 0x01 -#define SCSI_TYPE_PRINTER 0x02 -#define SCSI_TYPE_PROCESSOR 0x03 /* HP scanners use this */ -#define SCSI_TYPE_WORM 0x04 /* Treated as ROM by our system */ -#define SCSI_TYPE_ROM 0x05 -#define SCSI_TYPE_SCANNER 0x06 -#define SCSI_TYPE_MOD 0x07 /* Magneto-optical disk - treated as SCSI_TYPE_DISK */ -#define SCSI_TYPE_MEDIUM_CHANGER 0x08 -#define SCSI_TYPE_COMM 0x09 /* Communications device */ -#define SCSI_TYPE_RAID 0x0c -#define SCSI_TYPE_ENCLOSURE 0x0d /* Enclosure Services Device */ -#define SCSI_TYPE_RBC 0x0e -#define SCSI_TYPE_OSD 0x11 -#define SCSI_TYPE_NO_LUN 0x7f - struct hd_geometry { unsigned char heads; unsigned char sectors; unsigned short cylinders; /* truncated */ unsigned long start; }; -#endif +#endif /* HDIO_GETGEO */ + /* are we working with block device? */ int is_blkdev(int fd); @@ -131,7 +115,26 @@ int blkdev_is_cdrom(int fd); /* get device's geometry - legacy */ int blkdev_get_geometry(int fd, unsigned int *h, unsigned int *s); +/* SCSI device types. Copied almost as-is from kernel header. + * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=blob;f=include/scsi/scsi.h */ +#define SCSI_TYPE_DISK 0x00 +#define SCSI_TYPE_TAPE 0x01 +#define SCSI_TYPE_PRINTER 0x02 +#define SCSI_TYPE_PROCESSOR 0x03 /* HP scanners use this */ +#define SCSI_TYPE_WORM 0x04 /* Treated as ROM by our system */ +#define SCSI_TYPE_ROM 0x05 +#define SCSI_TYPE_SCANNER 0x06 +#define SCSI_TYPE_MOD 0x07 /* Magneto-optical disk - treated as SCSI_TYPE_DISK */ +#define SCSI_TYPE_MEDIUM_CHANGER 0x08 +#define SCSI_TYPE_COMM 0x09 /* Communications device */ +#define SCSI_TYPE_RAID 0x0c +#define SCSI_TYPE_ENCLOSURE 0x0d /* Enclosure Services Device */ +#define SCSI_TYPE_RBC 0x0e +#define SCSI_TYPE_OSD 0x11 +#define SCSI_TYPE_NO_LUN 0x7f + /* convert scsi type code to name */ char *blkdev_scsi_type_to_name(int type); + #endif /* BLKDEV_H */ |