Diff for /src/sys/sys/disk.h between versions 1.4 and 1.5

version 1.4, 2003/08/20 07:31:21 version 1.5, 2004/05/19 22:53:02
Line 1 Line 1
 /*  /*
    * Copyright (c) 2004 Matthew Dillon <dillon@backplane.com>
    * All rights reserved.
    *
    * 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
    *    notice, this list of conditions and the following disclaimer.
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in the
    *    documentation and/or other materials provided with the distribution.
    *
    * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
    * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
    * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
    * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
    * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
    * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
    * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    * SUCH DAMAGE.
    *
  * ----------------------------------------------------------------------------   * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):   * "THE BEER-WARE LICENSE" (Revision 42):
  * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you   * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
Line 8 Line 32
  *   *
  * $FreeBSD: src/sys/sys/disk.h,v 1.16.2.3 2001/06/20 16:11:01 scottl Exp $   * $FreeBSD: src/sys/sys/disk.h,v 1.16.2.3 2001/06/20 16:11:01 scottl Exp $
  * $DragonFly$   * $DragonFly$
  *  
  */   */
   
 #ifndef _SYS_DISK_H_  #ifndef _SYS_DISK_H_
Line 28 Line 51
   
 struct disk {  struct disk {
         struct lwkt_port        d_port;         /* interception port */          struct lwkt_port        d_port;         /* interception port */
        struct lwkt_port        *d_fwdport;       /* forward to real port */        struct cdevsw          *d_devsw;       /* our device switch */
         struct cdevsw           *d_rawsw;       /* the raw device switch */
         u_int                   d_flags;          u_int                   d_flags;
         u_int                   d_dsflags;          u_int                   d_dsflags;
        dev_t                   d_dev;        dev_t                   d_rawdev;    /* backing raw device */
         dev_t                   d_cdev;         /* special whole-disk part */
         struct diskslices       *d_slice;          struct diskslices       *d_slice;
         struct disklabel        d_label;          struct disklabel        d_label;
         LIST_ENTRY(disk)        d_list;          LIST_ENTRY(disk)        d_list;
Line 40  struct disk { Line 65  struct disk {
 #define DISKFLAG_LOCK           0x1  #define DISKFLAG_LOCK           0x1
 #define DISKFLAG_WANTED         0x2  #define DISKFLAG_WANTED         0x2
   
dev_t disk_create (int unit, struct disk *disk, int flags, struct cdevsw *cdevsw);dev_t disk_create (int unit, struct disk *disk, int flags, struct cdevsw *sw);
 void disk_destroy (struct disk *disk);  void disk_destroy (struct disk *disk);
 int disk_dumpcheck (dev_t dev, u_int *count, u_int *blkno, u_int *secsize);  int disk_dumpcheck (dev_t dev, u_int *count, u_int *blkno, u_int *secsize);
 struct disk *disk_enumerate (struct disk *disk);  struct disk *disk_enumerate (struct disk *disk);

Removed from v.1.4  
changed lines
  Added in v.1.5