Catch up with the proc -> d_thread_t change.

This commit is contained in:
Mike Smith 2001-12-02 06:17:16 +00:00
parent 57c307da7c
commit d3e4392c83
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=87187
2 changed files with 13 additions and 5 deletions

View file

@ -216,7 +216,7 @@ static d_ioctl_t ciss_ioctl;
static struct cdevsw ciss_cdevsw = {
ciss_open, ciss_close, noread, nowrite, ciss_ioctl,
nopoll, nommap, nostrategy, "ciss", CISS_CDEV_MAJOR,
nodump, nopsize, 0, -1
nodump, nopsize, 0, nokqfilter
};
/************************************************************************
@ -3210,7 +3210,7 @@ ciss_name_command_status(int status)
* Handle an open on the control device.
*/
static int
ciss_open(dev_t dev, int flags, int fmt, struct proc *p)
ciss_open(dev_t dev, int flags, int fmt, d_thread_t *p)
{
struct ciss_softc *sc;
@ -3228,7 +3228,7 @@ ciss_open(dev_t dev, int flags, int fmt, struct proc *p)
* Handle the last close on the control device.
*/
static int
ciss_close(dev_t dev, int flags, int fmt, struct proc *p)
ciss_close(dev_t dev, int flags, int fmt, d_thread_t *p)
{
struct ciss_softc *sc;
@ -3247,7 +3247,7 @@ ciss_close(dev_t dev, int flags, int fmt, struct proc *p)
* simplify the porting of Compaq's userland tools.
*/
static int
ciss_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
ciss_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, d_thread_t *p)
{
struct ciss_softc *sc;
int error;

View file

@ -71,6 +71,14 @@
*/
#define CISS_MAX_EVENTS 32
/************************************************************************
* Compatibility with older versions of FreeBSD
*/
#if __FreeBSD_version < 440001
#warning testing old-FreeBSD compat
typedef struct proc d_thread_t;
#endif
/************************************************************************
* Command queue statistics
*/
@ -89,7 +97,7 @@ struct ciss_qstat
/************************************************************************
* Driver version. Only really significant to the ACU interface.
*/
#define CISS_DRIVER_VERSION 20011009
#define CISS_DRIVER_VERSION 20011201
/************************************************************************
* Driver data structures