- use (uint8_t *) for buffer args on *_adbcomplete() functions

- remove kbd_adbcomplete() decl from akbd.c since it's in akbdvar.h
This commit is contained in:
tsutsui 2007-03-05 10:47:05 +00:00
parent 48174a79c0
commit 2036f3e3a3
5 changed files with 15 additions and 16 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: abtn.c,v 1.12 2007/03/04 06:00:09 christos Exp $ */ /* $NetBSD: abtn.c,v 1.13 2007/03/05 10:47:05 tsutsui Exp $ */
/*- /*-
* Copyright (C) 1999 Tsubai Masanari. All rights reserved. * Copyright (C) 1999 Tsubai Masanari. All rights reserved.
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: abtn.c,v 1.12 2007/03/04 06:00:09 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: abtn.c,v 1.13 2007/03/05 10:47:05 tsutsui Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/device.h> #include <sys/device.h>
@ -63,7 +63,7 @@ struct abtn_softc {
static int abtn_match __P((struct device *, struct cfdata *, void *)); static int abtn_match __P((struct device *, struct cfdata *, void *));
static void abtn_attach __P((struct device *, struct device *, void *)); static void abtn_attach __P((struct device *, struct device *, void *));
static void abtn_adbcomplete __P((void *, void *, int)); static void abtn_adbcomplete __P((uint8_t *, uint8_t *, int));
CFATTACH_DECL(abtn, sizeof(struct abtn_softc), CFATTACH_DECL(abtn, sizeof(struct abtn_softc),
abtn_match, abtn_attach, NULL, NULL); abtn_match, abtn_attach, NULL, NULL);
@ -114,7 +114,7 @@ extern struct cfdriver akbd_cd;
void void
abtn_adbcomplete(buffer, data, adb_command) abtn_adbcomplete(buffer, data, adb_command)
void *buffer, data; uint8_t *buffer, *data;
int adb_command; int adb_command;
{ {
struct abtn_softc *sc = (struct abtn_softc *)data; struct abtn_softc *sc = (struct abtn_softc *)data;

View File

@ -1,4 +1,4 @@
/* $NetBSD: akbd.c,v 1.35 2007/03/04 06:00:10 christos Exp $ */ /* $NetBSD: akbd.c,v 1.36 2007/03/05 10:47:06 tsutsui Exp $ */
/* /*
* Copyright (C) 1998 Colin Wood * Copyright (C) 1998 Colin Wood
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.35 2007/03/04 06:00:10 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.36 2007/03/05 10:47:06 tsutsui Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/device.h> #include <sys/device.h>
@ -65,7 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.35 2007/03/04 06:00:10 christos Exp $");
*/ */
static int akbdmatch __P((struct device *, struct cfdata *, void *)); static int akbdmatch __P((struct device *, struct cfdata *, void *));
static void akbdattach __P((struct device *, struct device *, void *)); static void akbdattach __P((struct device *, struct device *, void *));
void kbd_adbcomplete __P((void *buffer, void *data_area, int adb_command));
static void kbd_processevent __P((adb_event_t *event, struct akbd_softc *)); static void kbd_processevent __P((adb_event_t *event, struct akbd_softc *));
#ifdef notyet #ifdef notyet
static u_char getleds __P((int)); static u_char getleds __P((int));
@ -265,8 +264,8 @@ akbdattach(parent, self, aux)
*/ */
void void
kbd_adbcomplete(buffer, data_area, adb_command) kbd_adbcomplete(buffer, data_area, adb_command)
void *buffer; uint8_t *buffer;
void *data_area; uint8_t *data_area;
int adb_command; int adb_command;
{ {
adb_event_t event; adb_event_t event;

View File

@ -1,4 +1,4 @@
/* $NetBSD: akbdvar.h,v 1.11 2007/03/04 06:00:10 christos Exp $ */ /* $NetBSD: akbdvar.h,v 1.12 2007/03/05 10:47:06 tsutsui Exp $ */
/* $OpenBSD: akbdvar.h,v 1.3 2002/03/27 21:48:12 drahn Exp $ */ /* $OpenBSD: akbdvar.h,v 1.3 2002/03/27 21:48:12 drahn Exp $ */
@ -67,7 +67,7 @@ struct akbd_softc {
#define LED_CAPSLOCK 0x2 #define LED_CAPSLOCK 0x2
#define LED_SCROLL_LOCK 0x4 #define LED_SCROLL_LOCK 0x4
void kbd_adbcomplete __P((void *buffer, void *data_area, int adb_command)); void kbd_adbcomplete __P((uint8_t *buffer, uint8_t *data_area, int adb_command));
void kbd_passup __P((struct akbd_softc *sc, int)); void kbd_passup __P((struct akbd_softc *sc, int));
#endif /* _MACPPC_KBDVAR_H_ */ #endif /* _MACPPC_KBDVAR_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: ams.c,v 1.24 2007/03/04 06:00:10 christos Exp $ */ /* $NetBSD: ams.c,v 1.25 2007/03/05 10:47:06 tsutsui Exp $ */
/* /*
* Copyright (C) 1998 Colin Wood * Copyright (C) 1998 Colin Wood
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.24 2007/03/04 06:00:10 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.25 2007/03/05 10:47:06 tsutsui Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/device.h> #include <sys/device.h>
@ -408,7 +408,7 @@ ems_init(struct ams_softc *sc)
* an ADB event record. * an ADB event record.
*/ */
void void
ms_adbcomplete(void *buffer, void *data_area, int adb_command) ms_adbcomplete(uint8_t *buffer, uint8_t *data_area, int adb_command)
{ {
adb_event_t event; adb_event_t event;
struct ams_softc *sc; struct ams_softc *sc;

View File

@ -1,4 +1,4 @@
/* $NetBSD: amsvar.h,v 1.7 2007/03/04 06:00:10 christos Exp $ */ /* $NetBSD: amsvar.h,v 1.8 2007/03/05 10:47:06 tsutsui Exp $ */
/* /*
* Copyright (C) 1998 Colin Wood * Copyright (C) 1998 Colin Wood
@ -71,7 +71,7 @@ struct ams_softc {
#define MSCLASS_TRACKBALL 2 #define MSCLASS_TRACKBALL 2
#define MSCLASS_TRACKPAD 3 #define MSCLASS_TRACKPAD 3
void ms_adbcomplete __P((void *buffer, void *data_area, int adb_command)); void ms_adbcomplete __P((uint8_t *buffer, uint8_t *data_area, int adb_command));
void ms_handoff __P((adb_event_t *event, struct ams_softc *)); void ms_handoff __P((adb_event_t *event, struct ams_softc *));
#endif /* _MACPPC_AMSVAR_H_ */ #endif /* _MACPPC_AMSVAR_H_ */