src/sys/sys/disklabel.h - diff

Return to disklabel.h CVS log

Up to [DragonFly] / src / sys / sys

version 1.5, 2004/03/04 01:37:57	version 1.6, 2004/05/19 22:53:02
Line 42	Line 42
#include <sys/types.h>	#include <sys/types.h>
#endif	#endif
#include <sys/ioccom.h>	#include <sys/ioccom.h>
	#include <sys/conf.h>

/*	/*
* Disk description table, see disktab(5)	* Disk description table, see disktab(5)
Line 384 struct partinfo {	Line 385 struct partinfo {
(((slice) << 16) \| (((unit) & 0x1e0) << 16) \| \	(((slice) << 16) \| (((unit) & 0x1e0) << 16) \| \
(((unit) & 0x1f) << 3) \| (part & 7) \| \	(((unit) & 0x1f) << 3) \| (part & 7) \| \
((part & 0x08) << 17))	((part & 0x08) << 17))

	static __inline u_int
	dkunitmask(void)
	{
	return (0x01e000f8);
	}

	static __inline u_int
	dkmakeunit(int unit)
	{
	return(dkmakeminor(unit, 0, 0));
	}

static __inline dev_t	static __inline dev_t
dkmodpart(dev_t dev, int part)	dkmodpart(dev_t dev, int part)
{	{
Line 393 dkmodpart(dev_t dev, int part)	Line 407 dkmodpart(dev_t dev, int part)
val = (part & 7);	val = (part & 7);
else	else
val = (part & 7) \| 0x100000;	val = (part & 7) \| 0x100000;
return (makedev(major(dev), (minor(dev) & ~0x100007) \| val));	return (make_sub_dev(dev, (minor(dev) & ~0x100007) \| val));
}	}

static __inline dev_t	static __inline dev_t
dkmodslice(dev_t dev, int slice)	dkmodslice(dev_t dev, int slice)
{	{
return (makedev(major(dev), (minor(dev) & ~0x0f0000) \| (slice << 16)));	return (make_sub_dev(dev, (minor(dev) & ~0x0f0000) \| (slice << 16)));
}	}

static __inline int	static __inline int