Browse Source

keep naming of audio devices consistent across all archs that have audio

support.
--
Ok'd by: deraadt@
OPENBSD_2_9
brad 24 years ago
parent
commit
8b05b68bbc
4 changed files with 37 additions and 29 deletions
  1. +11
    -9
      src/etc/etc.amiga/MAKEDEV
  2. +8
    -5
      src/etc/etc.i386/MAKEDEV
  3. +6
    -3
      src/etc/etc.powerpc/MAKEDEV
  4. +12
    -12
      src/etc/etc.sparc/MAKEDEV

+ 11
- 9
src/etc/etc.amiga/MAKEDEV View File

@ -1,5 +1,5 @@
#!/bin/sh -
# $OpenBSD: MAKEDEV,v 1.45 2000/09/03 14:46:45 espie Exp $
# $OpenBSD: MAKEDEV,v 1.46 2001/04/10 03:03:50 brad Exp $
# $NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
@ -654,20 +654,22 @@ uk*)
;;
audio*)
unit=${i#audio}
audio=audio$unit
sound=sound$unit
mixer=mixer$unit
major=39
audioctl=audioctl$unit
if [ "$unit" = "" ]; then unit=0; fi
major=39
audio=audio$unit
sound=sound$unit
mixer=mixer$unit
audioctl=audioctl$unit
rm -f $audio $sound $mixer $audioctl
mknod $sound c $major $(($unit + 0))
mknod $sound c $major $unit
mknod $audio c $major $(($unit + 128))
mknod $mixer c $major $(($unit + 16))
mknod $audioctl c $major $(($unit + 192))
chown root.wheel $audio $sound $mixer $audioctl
chmod 666 $audio $sound $mixer $audioctl
[ -e audio ] || ln -s $audio audio
[ -e mixer ] || ln -s $mixer mixer
[ -e sound ] || ln -s $sound sound
[ -e audioctl ] || ln -s $audioctl audioctl
;;


+ 8
- 5
src/etc/etc.i386/MAKEDEV View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $OpenBSD: MAKEDEV,v 1.89 2001/02/20 23:53:26 jbm Exp $
# $OpenBSD: MAKEDEV,v 1.90 2001/04/10 03:03:51 brad Exp $
# $NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
@ -84,7 +84,7 @@
# bpf* packet filter
# speaker pc speaker (XXX - installed)
# lkm loadable kernel modules interface
# audio audio device
# audio* audio device
# apm power management device
# tun* network tunnel driver
# joy* joystick driver
@ -191,7 +191,7 @@ all)
sh $this wscons
sh $this ipl tun0 tun1 tun2
sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
sh $this speaker lkm audio joy0 joy1 apm local
sh $this speaker lkm audio0 joy0 joy1 apm local
sh $this random ses0 uk0 uk1 ss0 ss1 pctr bktr0 tuner0 wdt0
sh $this fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
sh $this fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H
@ -615,12 +615,11 @@ lkm)
# ;;
audio*)
[ "$unit" = "0" ] && n= || n=$unit
major=42
audio=audio$n
sound=sound$n
mixer=mixer$n
audioctl=audioctl$n
major=42
rm -f $audio $sound $mixer $audioctl
mknod $sound c $major $unit
mknod $audio c $major $(( $unit + 128 ))
@ -628,6 +627,10 @@ audio*)
mknod $audioctl c $major $(( $unit + 192 ))
chown root.wheel $audio $sound $mixer $audioctl
chmod 666 $audio $sound $mixer $audioctl
[ -e audio ] || ln -s $audio audio
[ -e mixer ] || ln -s $mixer mixer
[ -e sound ] || ln -s $sound sound
[ -e audioctl ] || ln -s $audioctl audioctl
;;
joy*)


+ 6
- 3
src/etc/etc.powerpc/MAKEDEV View File

@ -1,5 +1,5 @@
#!/bin/sh -
# $OpenBSD: MAKEDEV,v 1.42 2001/03/29 19:57:35 drahn Exp $
# $OpenBSD: MAKEDEV,v 1.43 2001/04/10 03:03:52 brad Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@ -436,12 +436,11 @@ cd*)
;;
audio*)
[ "$unit" = "0" ] && n= || n=$unit
major=44
audio=audio$n
sound=sound$n
mixer=mixer$n
audioctl=audioctl$n
major=44
rm -f $audio $sound $mixer $audioctl
mknod $sound c $major $unit
mknod $audio c $major $(( $unit + 128 ))
@ -449,6 +448,10 @@ audio*)
mknod $audioctl c $major $(( $unit + 192 ))
chown root.wheel $audio $sound $mixer $audioctl
chmod 666 $audio $sound $mixer $audioctl
[ -e audio ] || ln -s $audio audio
[ -e mixer ] || ln -s $mixer mixer
[ -e sound ] || ln -s $sound sound
[ -e audioctl ] || ln -s $audioctl audioctl
;;
usb*)


+ 12
- 12
src/etc/etc.sparc/MAKEDEV View File

@ -1,5 +1,5 @@
#!/bin/sh -
# $OpenBSD: MAKEDEV,v 1.63 2000/05/06 20:30:58 miod Exp $
# $OpenBSD: MAKEDEV,v 1.64 2001/04/10 03:03:53 brad Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@ -68,16 +68,16 @@
# uk* SCSI Unknown device
# ses* SCSI SES/SAF-TE device
# ss* SCSI scanners
# audio
# openprom
# bwtwo*
# cgtwo*
# cgthree*
# cgfour*
# cgsix*
# cgeight*
# cgfourteen*
# tcx*
# audio*
# openprom
# bwtwo*
# cgtwo*
# cgthree*
# cgfour*
# cgsix*
# cgeight*
# cgfourteen*
# tcx*
# bpf* Berkeley Packet Filter
# lkm loadable kernel modules interface
# tun* network tunnel driver
@ -202,7 +202,7 @@ all)
sh $this uk0 uk1
sh $this ss0 ss1
sh $this ses0
sh $this pty0 vnd0 vnd1 vnd2 vnd3 audio tun0 tun1 tun2 tun3
sh $this pty0 vnd0 vnd1 vnd2 vnd3 audio0 tun0 tun1 tun2 tun3
sh $this ccd0 ccd1 ccd2 ccd3
sh $this raid0 raid1 raid2 raid3
sh $this bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9


Loading…
Cancel
Save