 @@ -1,14 +1,14 @@
-/*	$NetBSD: disk.h,v 1.70 2017/03/05 23:07:12 mlelstv Exp $	*/
+/*	$NetBSD: disk.h,v 1.71 2017/06/08 22:24:59 chs Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -69,43 +69,29 @@
+ *
  * from: Header: disk.h,v 1.5 92/11/19 04:33:03 torek Exp  (LBL)
+ *
  *	@(#)disk.h	8.2 (Berkeley) 1/9/95
  */
 #ifndef _SYS_DISK_H_
 #define _SYS_DISK_H_
 /*
  * Disk device structures.
  */
 #ifdef _KERNEL
 #include <sys/device.h>
 #endif
 #include <sys/dkio.h>
 #include <sys/time.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
 #include <sys/iostat.h>
 #include <prop/proplib.h>
 struct buf;
 struct disk;
 struct disklabel;
 struct cpu_disklabel;
 struct lwp;
 struct vnode;
 /*
  * Disk information dictionary.
+ *
  * This contains general infomation for disk devices.
+ *
  *	<dict>
  *		<key>type</key>
  *		<string>...</string>
  *		<key>geometry</key>
  *		<dict>
  *			<!-- See below for disk geometry dictionary
  *			     contents. -->
 @@ -178,51 +164,26 @@ struct dkwedge_info {
 /*
  * dkwedge_list:
+ *
  *	Structure used to query a list of wedges.
  */
 struct dkwedge_list {
 	void		*dkwl_buf;	/* storage for dkwedge_info array */
 	size_t		dkwl_bufsize;	/* size of that buffer */
 	u_int		dkwl_nwedges;	/* total number of wedges */
 	u_int		dkwl_ncopied;	/* number actually copied */
 };
 #ifdef _KERNEL
 /*
  * dkwedge_discovery_method:
  *	Structure used to describe partition map parsing schemes
  *	used for wedge autodiscovery.
  */
 struct dkwedge_discovery_method {
 					/* link in wedge driver's list */
 	LIST_ENTRY(dkwedge_discovery_method) ddm_list;
 	const char	*ddm_name;	/* name of this method */
 	int		ddm_priority;	/* search priority */
 	int		(*ddm_discover)(struct disk *, struct vnode *);
 };
 #define	DKWEDGE_DISCOVERY_METHOD_DECL(name, prio, discover)		\
 static struct dkwedge_discovery_method name ## _ddm = {			\
 	{ NULL, NULL },							\
 	#name,								\
 	prio,								\
 	discover							\
 };									\
 __link_set_add_data(dkwedge_methods, name ## _ddm)
 #endif /* _KERNEL */
 /* Some common partition types */
 #define	DKW_PTYPE_UNKNOWN	""
 #define	DKW_PTYPE_UNUSED	"unused"
 #define	DKW_PTYPE_SWAP		"swap"
 #define	DKW_PTYPE_V6		"v6"
 #define	DKW_PTYPE_V7		"v7"
 #define	DKW_PTYPE_SYSV		"sysv"
 #define	DKW_PTYPE_V71K		"v71k"
 #define	DKW_PTYPE_V8		"v8"
 #define	DKW_PTYPE_FFS		"ffs"
 #define	DKW_PTYPE_FAT		"msdos"
 #define	DKW_PTYPE_LFS		"lfs"
 #define	DKW_PTYPE_OTHER		"other"
 @@ -301,26 +262,88 @@ struct disk_geom {
 	 * be physical sectors which occupy space at the end of each
 	 * track and/or cylinder.
 	 */
 	uint32_t	dg_sparespertrack;
 	uint32_t	dg_sparespercyl;
 	/*
 	 * Alternative cylinders include maintenance, replacement,
 	 * configuration description areas, etc.
 	 */
 	uint32_t	dg_acylinders;
 };
 /*
  * Bad sector lists per fixed disk
  */
 struct disk_badsectors {
 	SLIST_ENTRY(disk_badsectors)	dbs_next;
 	daddr_t		dbs_min;	/* min. sector number */
 	daddr_t		dbs_max;	/* max. sector number */
 	struct timeval	dbs_failedat;	/* first failure at */
 };
 struct disk_badsecinfo {
 	uint32_t	dbsi_bufsize;	/* size of region pointed to */
 	uint32_t	dbsi_skip;	/* how many to skip past */
 	uint32_t	dbsi_copied;	/* how many got copied back */
 	uint32_t	dbsi_left;	/* remaining to copy */
 	void *		dbsi_buffer;	/* region to copy disk_badsectors to */
 };
 #define	DK_STRATEGYNAMELEN	32
 struct disk_strategy {
 	char dks_name[DK_STRATEGYNAMELEN]; /* name of strategy */
 	char *dks_param;		/* notyet; should be NULL */
 	size_t dks_paramlen;		/* notyet; should be 0 */
 };
 #ifdef _KERNEL
 #include <sys/device.h>
 #include <sys/mutex.h>
 #include <sys/iostat.h>
 #include <prop/proplib.h>
 struct buf;
 struct disk;
 struct disklabel;
 struct cpu_disklabel;
 struct lwp;
 struct vnode;
 /*
  * dkwedge_discovery_method:
+ *
  *	Structure used to describe partition map parsing schemes
  *	used for wedge autodiscovery.
  */
 struct dkwedge_discovery_method {
 					/* link in wedge driver's list */
 	LIST_ENTRY(dkwedge_discovery_method) ddm_list;
 	const char	*ddm_name;	/* name of this method */
 	int		ddm_priority;	/* search priority */
 	int		(*ddm_discover)(struct disk *, struct vnode *);
 };
 #define	DKWEDGE_DISCOVERY_METHOD_DECL(name, prio, discover)		\
 static struct dkwedge_discovery_method name ## _ddm = {			\
 	{ NULL, NULL },							\
 	#name,								\
 	prio,								\
 	discover							\
 };									\
 __link_set_add_data(dkwedge_methods, name ## _ddm)
 /*
  * Disk partition dictionary.
+ *
  * A partition is represented as a dictionary containing generic partition
  * properties (such as starting block and block count), as well as information
  * that is specific to individual partition map formats.
+ *
  *	<dict>
  *		<key>start-block</key>
  *		<integer>...</integer>
  *		<key>block-count</key>
  *		<integer>...</integer>
  *		<!-- DKW_PTYPE strings ("" or missing if unknown) -->
  *		<key>type</type>
 @@ -460,81 +483,53 @@ struct disk {
 					/* all wedges on this disk */
 	LIST_HEAD(, dkwedge_softc) dk_wedges;
 	/*
 	 * Disk label information.  Storage for the in-core disk label
 	 * must be dynamically allocated, otherwise the size of this
 	 * structure becomes machine-dependent.
 	 */
 	daddr_t		dk_labelsector;		/* sector containing label */
 	struct disklabel *dk_label;	/* label */
 	struct cpu_disklabel *dk_cpulabel;
 };
 #ifdef _KERNEL
 struct dkdriver {
 	void	(*d_strategy)(struct buf *);
 	void	(*d_minphys)(struct buf *);
 	int	(*d_open)(dev_t, int, int, struct lwp *);
 	int	(*d_close)(dev_t, int, int, struct lwp *);
 	int	(*d_diskstart)(device_t, struct buf *);
 	void	(*d_iosize)(device_t, int *);
 	int	(*d_dumpblocks)(device_t, void *, daddr_t, int);
 	int	(*d_lastclose)(device_t);
 	int	(*d_discard)(device_t, off_t, off_t);
 	int	(*d_firstopen)(device_t, dev_t, int, int);
 	void	(*d_label)(device_t, struct disklabel *lp);
 };
 #endif
 /* states */
 #define	DK_CLOSED	0		/* drive is closed */
 #define	DK_WANTOPEN	1		/* drive being opened */
 #define	DK_WANTOPENRAW	2		/* drive being opened */
 #define	DK_RDLABEL	3		/* label being read */
 #define	DK_OPEN		4		/* label read, drive open */
 #define	DK_OPENRAW	5		/* open without label */
 /*
  * Bad sector lists per fixed disk
  */
 struct disk_badsectors {
 	SLIST_ENTRY(disk_badsectors)	dbs_next;
 	daddr_t		dbs_min;	/* min. sector number */
 	daddr_t		dbs_max;	/* max. sector number */
 	struct timeval	dbs_failedat;	/* first failure at */
 };
 struct disk_badsecinfo {
 	uint32_t	dbsi_bufsize;	/* size of region pointed to */
 	uint32_t	dbsi_skip;	/* how many to skip past */
 	uint32_t	dbsi_copied;	/* how many got copied back */
 	uint32_t	dbsi_left;	/* remaining to copy */
 	void *		dbsi_buffer;	/* region to copy disk_badsectors to */
 };
 #define	DK_STRATEGYNAMELEN	32
 struct disk_strategy {
 	char dks_name[DK_STRATEGYNAMELEN]; /* name of strategy */
 	char *dks_param;		/* notyet; should be NULL */
 	size_t dks_paramlen;		/* notyet; should be 0 */
 };
 #define	DK_BSIZE2BLKSHIFT(b)	((ffs((b) / DEV_BSIZE)) - 1)
 #define	DK_BSIZE2BYTESHIFT(b)	(ffs((b)) - 1)
 #define DK_DEV_BSIZE_OK(b) \
     ((b) >= DEV_BSIZE && ((b) & ((b) - 1)) == 0 && (b) <= MAXPHYS)
 #ifdef _KERNEL
 extern	int disk_count;			/* number of disks in global disklist */
 struct proc;
 void	disk_attach(struct disk *);
 int	disk_begindetach(struct disk *, int (*)(device_t), device_t, int);
 void	disk_detach(struct disk *);
 void	disk_init(struct disk *, const char *, const struct dkdriver *);
 void	disk_destroy(struct disk *);
 void	disk_wait(struct disk *);
 void	disk_busy(struct disk *);
 void	disk_unbusy(struct disk *, long, int);
 bool	disk_isbusy(struct disk *);
 @@ -545,16 +540,16 @@ void	disk_set_info(device_t, struct disk
 void	dkwedge_init(void);
 int	dkwedge_add(struct dkwedge_info *);
 int	dkwedge_del(struct dkwedge_info *);
 void	dkwedge_delall(struct disk *);
 int	dkwedge_list(struct disk *, struct dkwedge_list *, struct lwp *);
 void	dkwedge_discover(struct disk *);
 int	dkwedge_read(struct disk *, struct vnode *, daddr_t, void *, size_t);
 device_t dkwedge_find_by_wname(const char *);
 device_t dkwedge_find_by_parent(const char *, size_t *);
 const char *dkwedge_get_parent_name(dev_t);
 void	dkwedge_print_wnames(void);
 device_t dkwedge_find_partition(device_t, daddr_t, uint64_t);
-#endif
+#endif /* _KERNEL */
 #endif /* _SYS_DISK_H_ */