summaryrefslogtreecommitdiffstats
path: root/sys/dev/kbd
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-05-30 16:53:49 +0000
committerphk <phk@FreeBSD.org>1999-05-30 16:53:49 +0000
commit7e4a9dced9acd97789b37c32063ee7a8aa133f6d (patch)
tree407469b3581129f6442306683b28d6b54126baad /sys/dev/kbd
parentdfa3967ffa4d84ed0b1691fac89ba3e73b8544e0 (diff)
downloadFreeBSD-src-7e4a9dced9acd97789b37c32063ee7a8aa133f6d.zip
FreeBSD-src-7e4a9dced9acd97789b37c32063ee7a8aa133f6d.tar.gz
This commit should be a extensive NO-OP:
Reformat and initialize correctly all "struct cdevsw". Initialize the d_maj and d_bmaj fields. The d_reset field was not removed, although it is never used. I used a program to do most of this, so all the files now use the same consistent format. Please keep it that way. Vinum and i4b not modified, patches emailed to respective authors.
Diffstat (limited to 'sys/dev/kbd')
-rw-r--r--sys/dev/kbd/atkbd.c27
-rw-r--r--sys/dev/kbd/kbd.c25
2 files changed, 41 insertions, 11 deletions
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index ecbac63..ea828f0 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: atkbd.c,v 1.9 1999/05/18 11:05:58 yokota Exp $
+ * $Id: atkbd.c,v 1.10 1999/05/20 09:49:33 yokota Exp $
*/
#include "atkbd.h"
@@ -64,11 +64,26 @@ static d_read_t atkbdread;
static d_ioctl_t atkbdioctl;
static d_poll_t atkbdpoll;
-static struct cdevsw atkbd_cdevsw = {
- atkbdopen, atkbdclose, atkbdread, nowrite,
- atkbdioctl, nostop, nullreset, nodevtotty,
- atkbdpoll, nommap, NULL, ATKBD_DRIVER_NAME,
- NULL, -1,
+static struct cdevsw atkbd_cdevsw = {
+ /* open */ atkbdopen,
+ /* close */ atkbdclose,
+ /* read */ atkbdread,
+ /* write */ nowrite,
+ /* ioctl */ atkbdioctl,
+ /* stop */ nostop,
+ /* reset */ noreset,
+ /* devtotty */ nodevtotty,
+ /* poll */ atkbdpoll,
+ /* mmap */ nommap,
+ /* strategy */ nostrategy,
+ /* name */ ATKBD_DRIVER_NAME,
+ /* parms */ noparms,
+ /* maj */ -1,
+ /* dump */ nodump,
+ /* psize */ nopsize,
+ /* flags */ 0,
+ /* maxio */ 0,
+ /* bmaj */ -1
};
#endif /* KBD_INSTALL_CDEV */
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 7562422..47d9d5e 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: kbd.c,v 1.6 1999/05/18 11:08:39 yokota Exp $
+ * $Id: kbd.c,v 1.7 1999/05/30 14:55:24 phk Exp $
*/
#include "kbd.h"
@@ -406,10 +406,25 @@ static d_mmap_t kbdmmap;
#define CDEV_MAJOR 112
static struct cdevsw kbd_cdevsw = {
- kbdopen, kbdclose, kbdread, kbdwrite, /* ??? */
- kbdioctl, nullstop, noreset, kbddevtotty,
- kbdpoll, kbdmmap, nostrategy, "kbd",
- NULL, -1, nodump, nopsize,
+ /* open */ kbdopen,
+ /* close */ kbdclose,
+ /* read */ kbdread,
+ /* write */ kbdwrite,
+ /* ioctl */ kbdioctl,
+ /* stop */ nostop,
+ /* reset */ noreset,
+ /* devtotty */ kbddevtotty,
+ /* poll */ kbdpoll,
+ /* mmap */ kbdmmap,
+ /* strategy */ nostrategy,
+ /* name */ "kbd",
+ /* parms */ noparms,
+ /* maj */ CDEV_MAJOR,
+ /* dump */ nodump,
+ /* psize */ nopsize,
+ /* flags */ 0,
+ /* maxio */ 0,
+ /* bmaj */ -1
};
static void
OpenPOWER on IntegriCloud