diff options
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/cmlb_impl.h | 20 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/dkio.h | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/dktp/fdisk.h | 29 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/scsi/targets/sddef.h | 10 |
4 files changed, 4 insertions, 60 deletions
diff --git a/usr/src/uts/common/sys/cmlb_impl.h b/usr/src/uts/common/sys/cmlb_impl.h index a10ad13e13..797213c52a 100644 --- a/usr/src/uts/common/sys/cmlb_impl.h +++ b/usr/src/uts/common/sys/cmlb_impl.h @@ -35,16 +35,10 @@ extern "C" { #include <sys/ddi.h> #include <sys/sunddi.h> -/* - * FDISK partitions - 4 primary and MAX_EXT_PARTS number of Extended - * Partitions. - */ -#define FDISK_PARTS (FD_NUMPART + MAX_EXT_PARTS) - #if defined(_SUNOS_VTOC_8) #define NSDMAP NDKMAP #elif defined(_SUNOS_VTOC_16) -#define NSDMAP (NDKMAP + FDISK_PARTS + 1) +#define NSDMAP (NDKMAP + FD_NUMPART + 1) #else #error "No VTOC format defined." #endif @@ -121,7 +115,6 @@ extern "C" { struct fmap { ulong_t fmap_start; /* starting block number */ ulong_t fmap_nblk; /* number of blocks */ - uchar_t fmap_systid; /* systid of the partition */ }; /* for cm_state */ @@ -157,7 +150,7 @@ typedef struct cmlb_lun { diskaddr_t cl_offset[MAXPART]; /* partition start blocks */ - struct fmap cl_fmap[FDISK_PARTS]; /* fdisk partitions */ + struct fmap cl_fmap[FD_NUMPART]; /* fdisk partitions */ uchar_t cl_asciilabel[LEN_DKL_ASCII]; /* Disk ASCII label */ @@ -201,15 +194,6 @@ typedef struct cmlb_lun { int cl_device_type; /* DTYPE_DIRECT,.. */ int cl_reserved; /* reserved efi partition # */ cmlb_tg_ops_t *cmlb_tg_ops; -#if defined(__i386) || defined(__amd64) - /* - * Flag indicating whether extended partition nodes should be created - * or not. Is set in cmlb_attach. After creating nodes in - * cmlb_read_fdisk, it will be unset. - */ - int cl_update_ext_minor_nodes; - int cl_logical_drive_count; -#endif /* __i386 || __amd64 */ uint8_t cl_msglog_flag; /* used to enable/suppress */ /* certain log messages */ } cmlb_lun_t; diff --git a/usr/src/uts/common/sys/dkio.h b/usr/src/uts/common/sys/dkio.h index 067b718766..18f49e513a 100644 --- a/usr/src/uts/common/sys/dkio.h +++ b/usr/src/uts/common/sys/dkio.h @@ -230,11 +230,6 @@ struct dk_callback { */ #define DKIOCHOTPLUGGABLE (DKIOC|35) /* is hotpluggable */ -#if defined(__i386) || defined(__amd64) -/* ioctl to write extended partition structure into the disk */ -#define DKIOCSETEXTPART (DKIOC|46) -#endif - /* * Ioctl to force driver to re-read the alternate partition and rebuild * the internal defect map. diff --git a/usr/src/uts/common/sys/dktp/fdisk.h b/usr/src/uts/common/sys/dktp/fdisk.h index d745457ce5..ea0c1ef3ce 100644 --- a/usr/src/uts/common/sys/dktp/fdisk.h +++ b/usr/src/uts/common/sys/dktp/fdisk.h @@ -44,18 +44,6 @@ extern "C" { */ /* - * the MAX values are the maximum usable values for BIOS chs values - * The MAX_CYL value of 1022 is the maximum usable value - * the value of 1023 is a fence value, - * indicating no CHS geometry exists for the corresponding LBA value. - * HEAD range [ 0 .. MAX_HEAD ], so number of heads is (MAX_HEAD + 1) - * SECT range [ 1 .. MAX_SECT ], so number of sectors is (MAX_SECT) - */ -#define MAX_SECT (63) -#define MAX_CYL (1022) -#define MAX_HEAD (254) - -/* * BOOTSZ was reduced from 446 to 440 bytes to NOT overwrite the Windows * Vista DISKID. Otherwise Vista won't boot from Solaris GRUB in a dual-boot * setup. @@ -92,7 +80,6 @@ struct ipart { /* * Values for systid. */ -#define UNUSED 0 /* Empty Partition */ #define DOSOS12 1 /* DOS partition, 12-bit FAT */ #define PCIXOS 2 /* PC/IX partition */ #define DOSOS16 4 /* DOS partition, 16-bit FAT */ @@ -116,7 +103,7 @@ struct ipart { /* raw partition. ID was 0 but conflicted */ /* with DOS 3.3 fdisk */ #define UNIXOS 99 /* UNIX V.x partition */ -#define FDISK_NOVELL2 100 /* Novell Netware 286 */ +#define UNUSED 100 /* unassigned partition */ #define FDISK_NOVELL3 101 /* Novell Netware 3.x and later */ #define FDISK_QNX4 119 /* QNX 4.x */ #define FDISK_QNX42 120 /* QNX 4.x 2nd part */ @@ -152,20 +139,6 @@ struct mboot { /* master boot block */ ushort_t signature; }; -#if defined(__i386) || defined(__amd64) - -/* Byte offset of the start of the partition table within the sector */ -#define FDISK_PART_TABLE_START 446 - -/* Maximum number of valid partitions assumed as 32 */ -#define MAX_EXT_PARTS 32 - -#else - -#define MAX_EXT_PARTS 0 - -#endif /* if defined(__i386) || defined(__amd64) */ - #ifdef __cplusplus } #endif diff --git a/usr/src/uts/common/sys/scsi/targets/sddef.h b/usr/src/uts/common/sys/scsi/targets/sddef.h index 772bc32b77..0fc5cb9345 100644 --- a/usr/src/uts/common/sys/scsi/targets/sddef.h +++ b/usr/src/uts/common/sys/scsi/targets/sddef.h @@ -93,17 +93,9 @@ extern "C" { #elif defined(_SUNOS_VTOC_16) -/* - * XXX - NSDMAP has multiple definitions, one more in cmlb_impl.h - * If they are coalesced into one, this definition will follow suit. - * FDISK partitions - 4 primary and MAX_EXT_PARTS number of Extended - * Partitions. - */ -#define FDISK_PARTS (FD_NUMPART + MAX_EXT_PARTS) - #define SDUNIT_SHIFT 6 #define SDPART_MASK 63 -#define NSDMAP (NDKMAP + FDISK_PARTS + 1) +#define NSDMAP (NDKMAP + FD_NUMPART + 1) #else #error "No VTOC format defined." |