Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adb_direct.h contents are in adbvar.h. No need for duplication.

Browse Source
This commit is contained in:
briggs 2005-02-01 02:03:01 +00:00
parent 3b8a48e530
commit dba5409d0b
2 changed files with 2 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sys/arch/macppc/dev/adb_direct.h
View File

@ -1,53 +0,0 @@
/* $NetBSD: adb_direct.h,v 1.1 1998/05/15 10:15:47 tsubai Exp $ */
/*
* Copyright (C) 1996 John P. Wittkoski
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by John P. Wittkoski.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/* From: adb_direct.h 1.4 10/23/96 jpw */
/*
* These are public declarations that other routines may need.
*/
/* types of adb hardware that we (will eventually) support */
#define ADB_HW_UNKNOWN 0x01 /* don't know */
#define ADB_HW_II 0x02 /* Mac II series */
#define ADB_HW_IISI 0x03 /* Mac IIsi series */
#define ADB_HW_PB 0x04 /* PowerBook series */
#define ADB_HW_CUDA 0x05 /* Machines with a Cuda chip */
int adb_poweroff __P((void));
int CountADBs __P((void));
void ADBReInit __P((void));
int GetIndADB __P((ADBDataBlock *info, int index));
int GetADBInfo __P((ADBDataBlock *info, int adbAddr));
int SetADBInfo __P((ADBSetInfoBlock *info, int adbAddr));
int ADBOp __P((Ptr buffer, Ptr compRout, Ptr data, short commandNum));
int adb_read_date_time __P((unsigned long *));
int adb_set_date_time __P((unsigned long));

5
sys/arch/macppc/dev/apm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: apm.c,v 1.10 2004/04/15 11:03:15 aymeric Exp $ */
/* $NetBSD: apm.c,v 1.11 2005/02/01 02:03:01 briggs Exp $ */
/* $OpenBSD: apm.c,v 1.5 2002/06/07 07:13:59 miod Exp $ */
/*-
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.10 2004/04/15 11:03:15 aymeric Exp $");
__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.11 2005/02/01 02:03:01 briggs Exp $");
#include "apm.h"
@ -68,7 +68,6 @@ __KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.10 2004/04/15 11:03:15 aymeric Exp $");
#include <machine/apmvar.h>
#include <macppc/dev/adbvar.h>
#include <macppc/dev/adb_direct.h>
#include <macppc/dev/pm_direct.h>
#if defined(APMDEBUG)