upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

NO_GEOM cleanup:

Browse source 
Move to "struct disk*" centric API.
Retire major #131 (mlxd)
This commit is contained in:
Poul-Henning Kamp 2003-02-25 07:35:41 +00:00
parent e78dcaf403
commit b2fe65c5be
4 changed files with 22 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/conf/majors
View file

@ -148,7 +148,7 @@ chrdev name comments
128 arla Arla (AFS-clone) driver
129 i2o Intelligent I/O Character Device
130 mlx Mylex DAC960 RAID (control device)
131 mlxd Mylex DAC960 RAID (disk device)
131
132 amr AMI MegaRAID (control device)
133
134 taupci Cronyx Tau-PCI card <vak@hanoi.cronyx.ru>

4
sys/dev/mlx/mlx_compat.h
View file

@ -65,8 +65,8 @@ typedef struct bio_queue_head mlx_bioq;
# define MLX_BIO_DATA(bp) (bp)->bio_data
# define MLX_BIO_LENGTH(bp) (bp)->bio_bcount
# define MLX_BIO_LBA(bp) (bp)->bio_pblkno
# define MLX_BIO_SOFTC(bp) (bp)->bio_dev->si_drv1
# define MLX_BIO_UNIT(bp) *(int *)((bp)->bio_dev->si_drv2)
# define MLX_BIO_SOFTC(bp) (bp)->bio_disk->d_drv1
# define MLX_BIO_UNIT(bp) (bp)->bio_disk->d_unit
# define MLX_BIO_SET_ERROR(bp, err) do { (bp)->bio_error = err; (bp)->bio_flags |= BIO_ERROR;} while(0)
# define MLX_BIO_HAS_ERROR(bp) ((bp)->bio_flags & BIO_ERROR)
# define MLX_BIO_RESID(bp) (bp)->bio_resid

59
sys/dev/mlx/mlx_disk.c
View file

@ -53,31 +53,7 @@ static int mlxd_probe(device_t dev);
static int mlxd_attach(device_t dev);
static int mlxd_detach(device_t dev);
static d_open_t mlxd_open;
static d_close_t mlxd_close;
static d_strategy_t mlxd_strategy;
static d_ioctl_t mlxd_ioctl;
#define MLXD_CDEV_MAJOR 131
static struct cdevsw mlxd_cdevsw = {
/* open */ mlxd_open,
/* close */ mlxd_close,
/* read */ physread,
/* write */ physwrite,
/* ioctl */ mlxd_ioctl,
/* poll */ nopoll,
/* mmap */ nommap,
/* strategy */ mlxd_strategy,
/* name */ "mlxd",
/* maj */ MLXD_CDEV_MAJOR,
/* dump */ nodump,
/* psize */ nopsize,
/* flags */ D_DISK,
};
devclass_t mlxd_devclass;
static struct cdevsw mlxddisk_cdevsw;
static device_method_t mlxd_methods[] = {
DEVMETHOD(device_probe, mlxd_probe),
@ -95,9 +71,9 @@ static driver_t mlxd_driver = {
DRIVER_MODULE(mlxd, mlx, mlxd_driver, mlxd_devclass, 0, 0);
static int
mlxd_open(dev_t dev, int flags, int fmt, struct thread *td)
mlxd_open(struct disk *dp)
{
struct mlxd_softc *sc = (struct mlxd_softc *)dev->si_drv1;
struct mlxd_softc *sc = (struct mlxd_softc *)dp->d_drv1;
debug_called(1);
@ -108,19 +84,14 @@ mlxd_open(dev_t dev, int flags, int fmt, struct thread *td)
if (sc->mlxd_controller->mlx_state & MLX_STATE_SHUTDOWN)
return(ENXIO);
sc->mlxd_disk.d_sectorsize = MLX_BLKSIZE;
sc->mlxd_disk.d_mediasize = MLX_BLKSIZE * (off_t)sc->mlxd_drive->ms_size;
sc->mlxd_disk.d_fwsectors = sc->mlxd_drive->ms_sectors;
sc->mlxd_disk.d_fwheads = sc->mlxd_drive->ms_heads;
sc->mlxd_flags |= MLXD_OPEN;
return (0);
}
static int
mlxd_close(dev_t dev, int flags, int fmt, struct thread *td)
mlxd_close(struct disk *dp)
{
struct mlxd_softc *sc = (struct mlxd_softc *)dev->si_drv1;
struct mlxd_softc *sc = (struct mlxd_softc *)dp->d_drv1;
debug_called(1);
@ -131,9 +102,9 @@ mlxd_close(dev_t dev, int flags, int fmt, struct thread *td)
}
static int
mlxd_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct thread *td)
mlxd_ioctl(struct disk *dp, u_long cmd, void *addr, int flag, struct thread *td)
{
struct mlxd_softc *sc = (struct mlxd_softc *)dev->si_drv1;
struct mlxd_softc *sc = (struct mlxd_softc *)dp->d_drv1;
int error;
debug_called(1);
@ -218,7 +189,6 @@ mlxd_attach(device_t dev)
struct mlxd_softc *sc = (struct mlxd_softc *)device_get_softc(dev);
device_t parent;
char *state;
dev_t dsk;
int s1, s2;
debug_called(1);
@ -252,9 +222,16 @@ mlxd_attach(device_t dev)
DEVSTAT_TYPE_STORARRAY | DEVSTAT_TYPE_IF_OTHER,
DEVSTAT_PRIORITY_ARRAY);
dsk = disk_create(sc->mlxd_unit, &sc->mlxd_disk, 0, &mlxd_cdevsw, &mlxddisk_cdevsw);
dsk->si_drv1 = sc;
sc->mlxd_dev_t = dsk;
sc->mlxd_disk.d_open = mlxd_open;
sc->mlxd_disk.d_close = mlxd_close;
sc->mlxd_disk.d_ioctl = mlxd_ioctl;
sc->mlxd_disk.d_strategy = mlxd_strategy;
sc->mlxd_disk.d_name = "mxld";
sc->mlxd_disk.d_drv1 = sc;
sc->mlxd_disk.d_sectorsize = MLX_BLKSIZE;
sc->mlxd_disk.d_mediasize = MLX_BLKSIZE * (off_t)sc->mlxd_drive->ms_size;
sc->mlxd_disk.d_fwsectors = sc->mlxd_drive->ms_sectors;
sc->mlxd_disk.d_fwheads = sc->mlxd_drive->ms_heads;
/*
* Set maximum I/O size to the lesser of the recommended maximum and the practical
@ -262,7 +239,9 @@ mlxd_attach(device_t dev)
*/
s1 = sc->mlxd_controller->mlx_enq2->me_maxblk * MLX_BLKSIZE;
s2 = (sc->mlxd_controller->mlx_enq2->me_max_sg - 1) * PAGE_SIZE;
dsk->si_iosize_max = imin(s1, s2);
sc->mlxd_disk.d_maxsize = imin(s1, s2);
disk_create(sc->mlxd_unit, &sc->mlxd_disk, 0, NULL, NULL);
return (0);
}

1
sys/dev/mlx/mlxvar.h
View file

@ -225,7 +225,6 @@ extern devclass_t mlxd_devclass;
struct mlxd_softc
{
device_t mlxd_dev;
dev_t mlxd_dev_t;
struct mlx_softc *mlxd_controller;
struct mlx_sysdrive *mlxd_drive;
struct disk mlxd_disk;