diff options
| author | Dan Harnett <danh@cvs.openbsd.org> | 2005-01-28 18:56:28 +0000 |
|---|---|---|
| committer | Dan Harnett <danh@cvs.openbsd.org> | 2005-01-28 18:56:28 +0000 |
| commit | ede547ca046626f7772193149a7d0152ad39a3c4 (patch) | |
| tree | 5597d6a6d34d1796963771f3a80790779ed1d10b | |
| parent | 18ff94cba9ffd0eb70ec9434d0280ec329ec98a1 (diff) | |
use Add() consistently and make sure we use decimal numbers for addition
in the case of ugen devices.
suggestions and ok todd@
| -rw-r--r-- | etc/MAKEDEV.common | 8 | ||||
| -rw-r--r-- | etc/etc.mvmeppc/MAKEDEV.md | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/etc/MAKEDEV.common b/etc/MAKEDEV.common index 78dfc00a0b4..0d64b5c9627 100644 --- a/etc/MAKEDEV.common +++ b/etc/MAKEDEV.common @@ -1,4 +1,4 @@ -vers(a, {-$OpenBSD: MAKEDEV.common,v 1.14 2005/01/14 22:39:11 miod Exp $-})dnl +vers(a, {-$OpenBSD: MAKEDEV.common,v 1.15 2005/01/28 18:56:27 danh Exp $-})dnl divert(1)dnl dnl dnl Common device definitions. @@ -328,7 +328,7 @@ _mkdev({-wsdisp-}, tty[C-F]*, {-U=${i##tty[C-F]} ttyF*) n=F m=expr(3*256);; esac case $U in - [0-9a-f]) M tty$n$U c major_wsdisp_c {-$(( 16#$U + $m ))-} 600;; + [0-9a-f]) M tty$n$U c major_wsdisp_c Add(16#$U, $m) 600;; cfg) M tty${n}cfg c major_wsdisp_c Add(255,$m) 600;; *) echo bad unit $U for $i; exit 1;; esac-})dnl @@ -395,9 +395,9 @@ __devitem(uscan, uscanner*, Scanners,uscanner)dnl _mcdev({-uscan-}, uscanner*, {-uscanner-}, {-major_uscan_c-}, 660)dnl __devitem(ugen, ugen*, Generic USB devices)dnl _mkdev(ugen, ugen*, {-n=Mult($U, 16) - for j in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 + for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5} do - M ugen$U.$j c major_ugen_c Add($n, $j) 660 + M ugen$U.$j c major_ugen_c Add($n, 10#$j) 660 done-})dnl __devtitle(call, Call units)dnl __devtitle(term, Terminal ports)dnl diff --git a/etc/etc.mvmeppc/MAKEDEV.md b/etc/etc.mvmeppc/MAKEDEV.md index 25a271c24af..92b7f29b920 100644 --- a/etc/etc.mvmeppc/MAKEDEV.md +++ b/etc/etc.mvmeppc/MAKEDEV.md @@ -1,5 +1,5 @@ vers(__file__, - {-$OpenBSD: MAKEDEV.md,v 1.16 2004/04/11 18:05:23 millert Exp $-}, + {-$OpenBSD: MAKEDEV.md,v 1.17 2005/01/28 18:56:27 danh Exp $-}, etc.MACHINE)dnl dnl dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org> @@ -317,10 +317,10 @@ uhid*) ;; ugen*) - for j in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 + for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5} do rm -f ugen$unit.$j - mknod ugen$unit.$j c 63 $(( $unit * 16 + $j )) + mknod ugen$unit.$j c 63 $(( $unit * 16 + 10#$j )) chown root:wheel ugen$unit.$j chmod 660 ugen$unit.$j done |