Deleted Added
full compact
geom_disk.h (210471) geom_disk.h (219056)
1/*-
2 * Copyright (c) 2003 Poul-Henning Kamp
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Poul-Henning Kamp
6 * and NAI Labs, the Security Research Division of Network Associates, Inc.
7 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
8 * DARPA CHATS research program.

--- 17 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
1/*-
2 * Copyright (c) 2003 Poul-Henning Kamp
3 * All rights reserved.
4 *
5 * This software was developed for the FreeBSD Project by Poul-Henning Kamp
6 * and NAI Labs, the Security Research Division of Network Associates, Inc.
7 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
8 * DARPA CHATS research program.

--- 17 unchanged lines hidden (view full) ---

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $FreeBSD: head/sys/geom/geom_disk.h 210471 2010-07-25 15:43:52Z mav $
34 * $FreeBSD: head/sys/geom/geom_disk.h 219056 2011-02-26 14:58:54Z nwhitehorn $
35 */
36
37#ifndef _GEOM_GEOM_DISK_H_
38#define _GEOM_GEOM_DISK_H_
39
40#ifdef _KERNEL
41
42#include <sys/queue.h>

--- 37 unchanged lines hidden (view full) ---

80 u_int d_sectorsize;
81 off_t d_mediasize;
82 u_int d_fwsectors;
83 u_int d_fwheads;
84 u_int d_maxsize;
85 u_int d_stripeoffset;
86 u_int d_stripesize;
87 char d_ident[DISK_IDENT_SIZE];
35 */
36
37#ifndef _GEOM_GEOM_DISK_H_
38#define _GEOM_GEOM_DISK_H_
39
40#ifdef _KERNEL
41
42#include <sys/queue.h>

--- 37 unchanged lines hidden (view full) ---

80 u_int d_sectorsize;
81 off_t d_mediasize;
82 u_int d_fwsectors;
83 u_int d_fwheads;
84 u_int d_maxsize;
85 u_int d_stripeoffset;
86 u_int d_stripesize;
87 char d_ident[DISK_IDENT_SIZE];
88 char d_descr[DISK_IDENT_SIZE];
88 uint16_t d_hba_vendor;
89 uint16_t d_hba_device;
90 uint16_t d_hba_subvendor;
91 uint16_t d_hba_subdevice;
92
93 /* Fields private to the driver */
94 void *d_drv1;
95};

--- 17 unchanged lines hidden ---
89 uint16_t d_hba_vendor;
90 uint16_t d_hba_device;
91 uint16_t d_hba_subvendor;
92 uint16_t d_hba_subdevice;
93
94 /* Fields private to the driver */
95 void *d_drv1;
96};

--- 17 unchanged lines hidden ---