diff options
Diffstat (limited to 'sys/dev/pcm/isa')
| -rw-r--r-- | sys/dev/pcm/isa/mss.c | 20 | ||||
| -rw-r--r-- | sys/dev/pcm/isa/sb.c | 15 |
2 files changed, 21 insertions, 14 deletions
diff --git a/sys/dev/pcm/isa/mss.c b/sys/dev/pcm/isa/mss.c index 8b05fa8..9d0a0cf 100644 --- a/sys/dev/pcm/isa/mss.c +++ b/sys/dev/pcm/isa/mss.c @@ -323,13 +323,14 @@ mss_attach(struct isa_device *dev) } int -mss_open(dev_t dev, int flags, int mode, struct proc * p) +mss_open(dev_t i_dev, int flags, int mode, struct proc * p) { int unit; + int dev; snddev_info *d; u_long s; - dev = minor(dev); + dev = minor(i_dev); unit = dev >> 4 ; dev &= 0xf ; d = &pcm_info[unit] ; @@ -395,13 +396,14 @@ mss_open(dev_t dev, int flags, int mode, struct proc * p) } static int -mss_close(dev_t dev, int flags, int mode, struct proc * p) +mss_close(dev_t i_dev, int flags, int mode, struct proc * p) { int unit; + int dev; snddev_info *d; u_long s; - dev = minor(dev); + dev = minor(i_dev); unit = dev >> 4 ; dev &= 0xf; d = &pcm_info[unit] ; @@ -437,12 +439,13 @@ mss_close(dev_t dev, int flags, int mode, struct proc * p) } static int -mss_ioctl(dev_t dev, u_long cmd, caddr_t arg, int mode, struct proc * p) +mss_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc * p) { snddev_info *d; int unit; + int dev; - dev = minor(dev); + dev = minor(i_dev); unit = dev >> 4 ; d = &pcm_info[unit] ; /* @@ -1897,12 +1900,13 @@ gus_mem_cfg(snddev_info *d) #endif /* gus mem cfg... */ static int -ad1816_ioctl(dev_t dev, u_long cmd, caddr_t arg, int mode, struct proc * p) +ad1816_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc * p) { snddev_info *d; int unit; + int dev; - dev = minor(dev); + dev = minor(i_dev); unit = dev >> 4; d = &pcm_info[unit]; diff --git a/sys/dev/pcm/isa/sb.c b/sys/dev/pcm/isa/sb.c index 3c77f1f..9e453a2 100644 --- a/sys/dev/pcm/isa/sb.c +++ b/sys/dev/pcm/isa/sb.c @@ -160,12 +160,13 @@ sb_attach(struct isa_device *dev) * */ static int -sb_dsp_open(dev_t dev, int flags, int mode, struct proc * p) +sb_dsp_open(dev_t i_dev, int flags, int mode, struct proc * p) { snddev_info *d; int unit ; + int dev; - dev = minor(dev); + dev = minor(i_dev); unit = dev >> 4 ; d = &pcm_info[unit] ; @@ -235,13 +236,14 @@ sb_dsp_open(dev_t dev, int flags, int mode, struct proc * p) } static int -sb_dsp_close(dev_t dev, int flags, int mode, struct proc * p) +sb_dsp_close(dev_t i_dev, int flags, int mode, struct proc * p) { int unit; + int dev; snddev_info *d; u_long s; - dev = minor(dev); + dev = minor(i_dev); unit = dev >> 4 ; d = &pcm_info[unit] ; @@ -257,12 +259,13 @@ sb_dsp_close(dev_t dev, int flags, int mode, struct proc * p) } static int -sb_dsp_ioctl(dev_t dev, u_long cmd, caddr_t arg, int mode, struct proc * p) +sb_dsp_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc * p) { int unit; + int dev; snddev_info *d; - dev = minor(dev); + dev = minor(i_dev); unit = dev >> 4 ; d = &pcm_info[unit] ; |
