summaryrefslogtreecommitdiffstats
path: root/sys/dev/cy
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1996-10-13 01:30:32 +0000
committerdg <dg@FreeBSD.org>1996-10-13 01:30:32 +0000
commit26b6cb48f6b4e927405282de17db48afa0c64e3f (patch)
tree60bd7656224258515e56c7a14083b50b1db05bac /sys/dev/cy
parented14d44dd07e5aecbf60c33cfc80200bd76b7cec (diff)
downloadFreeBSD-src-26b6cb48f6b4e927405282de17db48afa0c64e3f.zip
FreeBSD-src-26b6cb48f6b4e927405282de17db48afa0c64e3f.tar.gz
Change DEVFS device naming convention for cuac*, ttyc*.
Diffstat (limited to 'sys/dev/cy')
-rw-r--r--sys/dev/cy/cy.c20
-rw-r--r--sys/dev/cy/cy_isa.c20
2 files changed, 26 insertions, 14 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 4634f4b..eaaac3a 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.37 1996/10/04 14:17:32 davidg Exp $
+ * $Id: cy.c,v 1.38 1996/10/13 01:09:16 davidg Exp $
*/
#include "cy.h"
@@ -586,22 +586,28 @@ cyattach_common(cy_iobase, cy_align)
#ifdef DEVFS
com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
unit, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyc%n", unit);
+ UID_ROOT, GID_WHEEL, 0600, "ttyc%n%n", adapter,
+ unit % CY_MAX_PORTS);
com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
unit | CONTROL_INIT_STATE, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyic%n", unit);
+ UID_ROOT, GID_WHEEL, 0600, "ttyic%n%n", adapter,
+ unit % CY_MAX_PORTS);
com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
unit | CONTROL_LOCK_STATE, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttylc%n", unit);
+ UID_ROOT, GID_WHEEL, 0600, "ttylc%n%n", adapter,
+ unit % CY_MAX_PORTS);
com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuac%n", unit);
+ UID_UUCP, GID_DIALER, 0660, "cuac%n%n", adapter,
+ unit % CY_MAX_PORTS);
com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuaic%n", unit);
+ UID_UUCP, GID_DIALER, 0660, "cuaic%n%n", adapter,
+ unit % CY_MAX_PORTS);
com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cualc%n", unit);
+ UID_UUCP, GID_DIALER, 0660, "cualc%n%n", adapter,
+ unit % CY_MAX_PORTS);
#endif
}
}
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 4634f4b..eaaac3a 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.37 1996/10/04 14:17:32 davidg Exp $
+ * $Id: cy.c,v 1.38 1996/10/13 01:09:16 davidg Exp $
*/
#include "cy.h"
@@ -586,22 +586,28 @@ cyattach_common(cy_iobase, cy_align)
#ifdef DEVFS
com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
unit, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyc%n", unit);
+ UID_ROOT, GID_WHEEL, 0600, "ttyc%n%n", adapter,
+ unit % CY_MAX_PORTS);
com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
unit | CONTROL_INIT_STATE, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttyic%n", unit);
+ UID_ROOT, GID_WHEEL, 0600, "ttyic%n%n", adapter,
+ unit % CY_MAX_PORTS);
com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
unit | CONTROL_LOCK_STATE, DV_CHR,
- UID_ROOT, GID_WHEEL, 0600, "ttylc%n", unit);
+ UID_ROOT, GID_WHEEL, 0600, "ttylc%n%n", adapter,
+ unit % CY_MAX_PORTS);
com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuac%n", unit);
+ UID_UUCP, GID_DIALER, 0660, "cuac%n%n", adapter,
+ unit % CY_MAX_PORTS);
com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cuaic%n", unit);
+ UID_UUCP, GID_DIALER, 0660, "cuaic%n%n", adapter,
+ unit % CY_MAX_PORTS);
com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
- UID_UUCP, GID_DIALER, 0660, "cualc%n", unit);
+ UID_UUCP, GID_DIALER, 0660, "cualc%n%n", adapter,
+ unit % CY_MAX_PORTS);
#endif
}
}
OpenPOWER on IntegriCloud