diff options
Diffstat (limited to 'sys/i386/include')
-rw-r--r-- | sys/i386/include/ansi.h | 18 | ||||
-rw-r--r-- | sys/i386/include/apm_bios.h | 3 | ||||
-rw-r--r-- | sys/i386/include/console.h | 77 | ||||
-rw-r--r-- | sys/i386/include/cpufunc.h | 74 | ||||
-rw-r--r-- | sys/i386/include/elf.h | 4 | ||||
-rw-r--r-- | sys/i386/include/i4b_cause.h | 144 | ||||
-rw-r--r-- | sys/i386/include/i4b_debug.h | 219 | ||||
-rw-r--r-- | sys/i386/include/i4b_ioctl.h | 606 | ||||
-rw-r--r-- | sys/i386/include/i4b_tel_ioctl.h | 52 | ||||
-rw-r--r-- | sys/i386/include/i4b_trace.h | 91 | ||||
-rw-r--r-- | sys/i386/include/iic.h | 19 | ||||
-rw-r--r-- | sys/i386/include/md_var.h | 15 | ||||
-rw-r--r-- | sys/i386/include/mouse.h | 4 | ||||
-rw-r--r-- | sys/i386/include/param.h | 6 | ||||
-rw-r--r-- | sys/i386/include/pc/vesa.h | 6 | ||||
-rw-r--r-- | sys/i386/include/pmap.h | 7 | ||||
-rw-r--r-- | sys/i386/include/resource.h | 43 | ||||
-rw-r--r-- | sys/i386/include/smb.h | 7 | ||||
-rw-r--r-- | sys/i386/include/types.h | 23 |
19 files changed, 92 insertions, 1326 deletions
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h index 9d7494e0fc120..52dad0bf856d6 100644 --- a/sys/i386/include/ansi.h +++ b/sys/i386/include/ansi.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $Id: ansi.h,v 1.15 1998/06/14 14:00:47 bde Exp $ + * $Id: ansi.h,v 1.14 1998/01/08 00:27:30 alex Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -54,6 +54,9 @@ #define _BSD_SSIZE_T_ int /* byte count or error */ #define _BSD_TIME_T_ long /* time()... */ #define _BSD_TIMER_T_ int /* timer_gettime()... */ +#define _BSD_UINT8_T_ unsigned char /* unsigned exactly 8 bits */ +#define _BSD_UINT16_T_ unsigned short /* unsigned exactly 16 bits */ +#define _BSD_UINT32_T_ unsigned int /* unsigned exactly 32 bits */ #define _BSD_WCHAR_T_ _BSD_CT_RUNE_T_ /* wchar_t (see below) */ /* @@ -106,18 +109,5 @@ typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t; typedef long long __int64_t; typedef unsigned long long __uint64_t; #endif -/* - * Internal names for basic integral types. Omit the typedef if - * not possible for a machine/compiler combination. - */ -typedef __signed char __int8_t; -typedef unsigned char __uint8_t; -typedef short __int16_t; -typedef unsigned short __uint16_t; -typedef int __int32_t; -typedef unsigned int __uint32_t; - -typedef int __intptr_t; -typedef unsigned int __uintptr_t; #endif /* !_MACHINE_ANSI_H_ */ diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h index 43028b370113e..616e36a2e894d 100644 --- a/sys/i386/include/apm_bios.h +++ b/sys/i386/include/apm_bios.h @@ -12,7 +12,7 @@ * * Aug, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm_bios.h,v 1.20 1998/07/06 06:29:05 imp Exp $ + * $Id: apm_bios.h,v 1.19 1997/11/12 04:12:51 jdp Exp $ */ #ifndef _MACHINE_APM_BIOS_H_ @@ -160,6 +160,7 @@ struct apmhook *apm_hook_establish (int apmh, struct apmhook *); void apm_hook_disestablish (int apmh, struct apmhook *); void apm_cpu_idle(void); void apm_cpu_busy(void); +void apm_power_off(void); #endif /* KERNEL */ diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h index c79759c356bd8..7f70bcaa052bb 100644 --- a/sys/i386/include/console.h +++ b/sys/i386/include/console.h @@ -25,7 +25,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: console.h,v 1.42 1999/01/01 14:38:28 des Exp $ + * $Id: console.h,v 1.40 1998/09/23 09:58:45 yokota Exp $ */ #ifndef _MACHINE_CONSOLE_H_ @@ -52,7 +52,6 @@ #define KDSETLED _IO('K', 66 /*, int */) #define KDSETRAD _IO('K', 67 /*, int */) #define KDRASTER _IOW('K', 100, scr_size_t) -#define KDGKBINFO _IOR('K', 101, keyboard_info_t) #define GETFKEY _IOWR('k', 0, fkeyarg_t) #define SETFKEY _IOWR('k', 1, fkeyarg_t) @@ -62,8 +61,6 @@ #define PIO_KEYMAP _IOW('k', 7, keymap_t) #define GIO_DEADKEYMAP _IOR('k', 8, accentmap_t) #define PIO_DEADKEYMAP _IOW('k', 9, accentmap_t) -#define GIO_KEYMAPENT _IOWR('k', 10, keyarg_t) -#define PIO_KEYMAPENT _IOW('k', 11, keyarg_t) #define GIO_ATTR _IOR('a', 0, int) #define GIO_COLOR _IOR('c', 0, int) @@ -89,14 +86,11 @@ #define CONS_GETINFO _IOWR('c', 73, vid_info_t) #define CONS_GETVERS _IOR('c', 74, int) #define CONS_CURRENTADP _IOR('c', 100, int) -#define CONS_ADPINFO _IOWR('c', 101, video_adapter_info_t) +#define CONS_ADPINFO _IOWR('c', 101, video_adapter_t) #define CONS_MODEINFO _IOWR('c', 102, video_info_t) #define CONS_FINDMODE _IOWR('c', 103, video_info_t) #define CONS_SETWINORG _IO('c', 104 /* u_int */) -#define CONS_SETKBD _IO('c', 110 /* int */) -#define CONS_RELKBD _IO('c', 111) - /* CONS_SAVERMODE */ #define CONS_LKM_SAVER 0 #define CONS_USR_SAVER 1 @@ -195,11 +189,9 @@ struct mouse_info { #define NLKED 2 /* Num locked */ #define SLKED 4 /* Scroll locked */ #define ALKED 8 /* AltGr locked */ -#define LOCK_MASK (CLKED | NLKED | SLKED | ALKED) #define LED_CAP 1 /* Caps lock LED */ #define LED_NUM 2 /* Num lock LED */ #define LED_SCR 4 /* Scroll lock LED */ -#define LED_MASK (LED_CAP | LED_NUM | LED_SCR) /* possible flag values */ #define FLAG_LOCK_O 0 @@ -212,7 +204,7 @@ struct mouse_info { #ifndef _KEYMAP_DECLARED #define _KEYMAP_DECLARED -struct keyent_t { +struct key_t { u_char map[NUM_STATES]; u_char spcl; u_char flgs; @@ -220,17 +212,10 @@ struct keyent_t { struct keymap { u_short n_keys; - struct keyent_t key[NUM_KEYS]; + struct key_t key[NUM_KEYS]; }; typedef struct keymap keymap_t; - -struct keyarg { - u_short keynum; - struct keyent_t key; -}; - -typedef struct keyarg keyarg_t; #endif /* !_KEYMAP_DECLARED */ #define NUM_DEADKEYS 15 /* number of accent keys */ @@ -289,9 +274,6 @@ struct ssaver { struct video_adapter { int va_index; int va_type; - char *va_name; - int va_unit; - int va_minor; int va_flags; #define V_ADP_COLOR (1<<0) #define V_ADP_MODECHANGE (1<<1) @@ -301,14 +283,7 @@ struct video_adapter { #define V_ADP_PALETTE (1<<5) #define V_ADP_BORDER (1<<6) #define V_ADP_VESA (1<<7) -#define V_ADP_PROBED (1<<16) -#define V_ADP_INITIALIZED (1<<17) -#define V_ADP_REGISTERED (1<<18) - int va_io_base; - int va_io_size; int va_crtc_addr; - int va_mem_base; - int va_mem_size; u_int va_window; /* virtual address */ size_t va_window_size; size_t va_window_gran; @@ -317,30 +292,6 @@ struct video_adapter { int va_initial_mode; int va_initial_bios_mode; int va_mode; - int va_mode_flags; /* copy of vi_flags */ - void *va_token; -}; - -struct video_adapter_info { - int va_index; - int va_type; - char va_name[16]; - int va_unit; - int va_flags; - int va_io_base; - int va_io_size; - int va_crtc_addr; - int va_mem_base; - int va_mem_size; - u_int va_window; /* virtual address */ - size_t va_window_size; - size_t va_window_gran; - u_int va_buffer; /* virtual address */ - size_t va_buffer_size; - int va_initial_mode; - int va_initial_bios_mode; - int va_mode; - int va_mode_flags; }; #define V_ADP_PRIMARY 0 @@ -352,7 +303,7 @@ struct video_info { int vi_flags; #define V_INFO_COLOR (1<<0) #define V_INFO_GRAPHICS (1<<1) -#define V_INFO_LINEAR (1<<2) +#define V_INFO_LENEAR (1<<2) #define V_INFO_VESA (1<<3) int vi_width; int vi_height; @@ -368,15 +319,6 @@ struct video_info { /* XXX pixel format, memory model,... */ }; -struct keyboard_info { - int kb_index; /* kbdio index# */ - char kb_name[16]; /* driver name */ - int kb_unit; /* unit# */ - int kb_type; /* KB_84, KB_101, KB_OTHER,... */ - int kb_config; /* device configuration flags */ - int kb_flags; /* internal flags */ -}; - typedef struct accentmap accentmap_t; typedef struct fkeytab fkeytab_t; typedef struct fkeyarg fkeyarg_t; @@ -388,9 +330,7 @@ typedef struct {char fnt8x14[14*256];} fnt14_t; typedef struct {char fnt8x16[16*256];} fnt16_t; typedef struct ssaver ssaver_t; typedef struct video_adapter video_adapter_t; -typedef struct video_adapter_info video_adapter_info_t; typedef struct video_info video_info_t; -typedef struct keyboard_info keyboard_info_t; typedef struct {int scr_size[3];} scr_size_t; /* defines for "special" keys (spcl bit set in keymap) */ @@ -448,13 +388,6 @@ typedef struct {int scr_size[3];} scr_size_t; #define MKEY 0x400 /* meta key marker (prepend ESC)*/ #define BKEY 0x800 /* backtab (ESC [ Z) */ -#define SPCLKEY 0x8000 /* special key */ -#define RELKEY 0x4000 /* key released */ -#define ERRKEY 0x2000 /* error */ - -#define KEYCHAR(c) ((c) & 0x00ff) -#define KEYFLAGS(c) ((c) & ~0x00ff) - /* video mode definitions */ #define M_B40x25 0 /* black & white 40 columns */ #define M_C40x25 1 /* color 40 columns */ diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index ce6bf05890017..977003cb5c238 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: cpufunc.h,v 1.84 1999/01/08 19:51:02 bde Exp $ + * $Id: cpufunc.h,v 1.80 1998/07/11 04:58:25 bde Exp $ */ /* @@ -40,6 +40,15 @@ #ifndef _MACHINE_CPUFUNC_H_ #define _MACHINE_CPUFUNC_H_ +#include <sys/cdefs.h> +#include <sys/types.h> + +#include <machine/lock.h> + +#if defined(SWTCH_OPTIM_STATS) +extern int tlb_flush_count; +#endif + #define readb(va) (*(volatile u_int8_t *) (va)) #define readw(va) (*(volatile u_int16_t *) (va)) #define readl(va) (*(volatile u_int32_t *) (va)) @@ -50,14 +59,6 @@ #ifdef __GNUC__ -#ifdef SMP -#include <machine/lock.h> /* XXX */ -#endif - -#ifdef SWTCH_OPTIM_STATS -extern int tlb_flush_count; /* XXX */ -#endif - static __inline void breakpoint(void) { @@ -68,17 +69,13 @@ static __inline void disable_intr(void) { __asm __volatile("cli" : : : "memory"); -#ifdef SMP MPINTR_LOCK(); -#endif } static __inline void enable_intr(void) { -#ifdef SMP MPINTR_UNLOCK(); -#endif __asm __volatile("sti"); } @@ -194,27 +191,24 @@ static __inline void insb(u_int port, void *addr, size_t cnt) { __asm __volatile("cld; rep; insb" - : "=D" (addr), "=c" (cnt) - : "0" (addr), "1" (cnt), "d" (port) - : "memory"); + : : "d" (port), "D" (addr), "c" (cnt) + : "di", "cx", "memory"); } static __inline void insw(u_int port, void *addr, size_t cnt) { __asm __volatile("cld; rep; insw" - : "=D" (addr), "=c" (cnt) - : "0" (addr), "1" (cnt), "d" (port) - : "memory"); + : : "d" (port), "D" (addr), "c" (cnt) + : "di", "cx", "memory"); } static __inline void insl(u_int port, void *addr, size_t cnt) { __asm __volatile("cld; rep; insl" - : "=D" (addr), "=c" (cnt) - : "0" (addr), "1" (cnt), "d" (port) - : "memory"); + : : "d" (port), "D" (addr), "c" (cnt) + : "di", "cx", "memory"); } static __inline void @@ -223,11 +217,11 @@ invd(void) __asm __volatile("invd"); } -#if defined(SMP) && defined(KERNEL) +#ifdef KERNEL +#ifdef SMP /* - * When using APIC IPI's, invlpg() is not simply the invlpg instruction - * (this is a bug) and the inlining cost is prohibitive since the call + * When using APIC IPI's, the inlining cost is prohibitive since the call * executes into the IPI transmission system. */ void invlpg __P((u_int addr)); @@ -236,7 +230,7 @@ void invltlb __P((void)); static __inline void cpu_invlpg(void *addr) { - __asm __volatile("invlpg %0" : : "m" (*(char *)addr) : "memory"); + __asm __volatile("invlpg %0"::"m"(*(char *)addr):"memory"); } static __inline void @@ -253,15 +247,15 @@ cpu_invltlb(void) ++tlb_flush_count; #endif } - -#else /* !(SMP && KERNEL) */ +#else /* !SMP */ static __inline void invlpg(u_int addr) { - __asm __volatile("invlpg %0" : : "m" (*(char *)addr) : "memory"); + __asm __volatile("invlpg %0"::"m"(*(char *)addr):"memory"); } + static __inline void invltlb(void) { @@ -272,12 +266,13 @@ invltlb(void) */ __asm __volatile("movl %%cr3, %0; movl %0, %%cr3" : "=r" (temp) : : "memory"); -#ifdef SWTCH_OPTIM_STATS +#if defined(SWTCH_OPTIM_STATS) ++tlb_flush_count; #endif } -#endif /* SMP && KERNEL */ +#endif /* SMP */ +#endif /* KERNEL */ static __inline u_short inw(u_int port) @@ -327,24 +322,24 @@ static __inline void outsb(u_int port, const void *addr, size_t cnt) { __asm __volatile("cld; rep; outsb" - : "=S" (addr), "=c" (cnt) - : "0" (addr), "1" (cnt), "d" (port)); + : : "d" (port), "S" (addr), "c" (cnt) + : "si", "cx"); } static __inline void outsw(u_int port, const void *addr, size_t cnt) { __asm __volatile("cld; rep; outsw" - : "=S" (addr), "=c" (cnt) - : "0" (addr), "1" (cnt), "d" (port)); + : : "d" (port), "S" (addr), "c" (cnt) + : "si", "cx"); } static __inline void outsl(u_int port, const void *addr, size_t cnt) { __asm __volatile("cld; rep; outsl" - : "=S" (addr), "=c" (cnt) - : "0" (addr), "1" (cnt), "d" (port)); + : : "d" (port), "S" (addr), "c" (cnt) + : "si", "cx"); } static __inline void @@ -399,7 +394,7 @@ rdtsc(void) } static __inline void -setbits(volatile u_int *addr, u_int bits) +setbits(volatile unsigned *addr, u_int bits) { __asm __volatile( #ifdef SMP @@ -452,7 +447,7 @@ u_int64_t rdmsr __P((u_int msr)); u_int64_t rdpmc __P((u_int pmc)); u_int64_t rdtsc __P((void)); u_int read_eflags __P((void)); -void setbits __P((volatile u_int *addr, u_int bits)); +void setbits __P((volatile unsigned *addr, u_int bits)); void wbinvd __P((void)); void write_eflags __P((u_int ef)); void wrmsr __P((u_int msr, u_int64_t newval)); @@ -466,5 +461,6 @@ void ltr __P((u_short sel)); u_int rcr0 __P((void)); u_int rcr3 __P((void)); u_int rcr4 __P((void)); +void i686_pagezero __P((void *addr)); #endif /* !_MACHINE_CPUFUNC_H_ */ diff --git a/sys/i386/include/elf.h b/sys/i386/include/elf.h index 93f486bf2d021..5605b6fb3f84b 100644 --- a/sys/i386/include/elf.h +++ b/sys/i386/include/elf.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: elf.h,v 1.4 1998/09/14 20:30:12 jdp Exp $ + * $Id: elf.h,v 1.3 1998/08/16 03:03:31 jdp Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -40,8 +40,6 @@ #define ELF_ARCH EM_386 -#define ELF_MACHINE_OK(x) ((x) == EM_386 || (x) == EM_486) - /* * Auxiliary vector entries for passing information to the interpreter. * diff --git a/sys/i386/include/i4b_cause.h b/sys/i386/include/i4b_cause.h deleted file mode 100644 index 439db4e2bcc4b..0000000000000 --- a/sys/i386/include/i4b_cause.h +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. - * - *--------------------------------------------------------------------------- - * - * i4b_cause.h - causes and cause handling for i4b - * ----------------------------------------------- - * - * $Id: i4b_cause.h,v 1.8 1998/12/05 18:05:55 hm Exp $ - * - * last edit-date: [Sat Dec 5 18:36:30 1998] - * - *---------------------------------------------------------------------------*/ - -#ifndef _I4B_CAUSE_H_ -#define _I4B_CAUSE_H_ - -/*---------------------------------------------------------------------------* - * ISDN4BSD internal causes specification - *---------------------------------------------------------------------------*/ - -#define CAUSE_VAL 0x000000ff /* cause value */ -#define CAUSE_TYPE 0x0000ff00 /* cause type */ -#define CAUSET_Q850 0 /* value coded according to Q.850 */ -#define CAUSET_I4B 1 /* i4b protocol independent causes*/ - -#define GET_CAUSE_VAL(cause) ((cause) & 0xff) -#define SET_CAUSE_VAL(dest, val) ((dest) = ((dest & 0xffffff00) | \ - (val & 0x000000ff))) - -#define GET_CAUSE_TYPE(cause) (((cause) >> 8) & 0xff) -#define SET_CAUSE_TYPE(dest, type) ((dest) = ((dest & 0xffff00ff) | \ - ((type << 8) & 0x0000ff00))) - -#define SET_CAUSE_TV(dest, type, val) ((dest) = ((val & 0x000000ff) | \ - ((type << 8) & 0x0000ff00))) - -/* CAUSET_I4B - protocol independent cause values */ - -#define CAUSE_I4B_NORMAL 0 /* normal call clearing */ -#define CAUSE_I4B_BUSY 1 /* user busy */ -#define CAUSE_I4B_NOCHAN 2 /* circuit/channel not available*/ -#define CAUSE_I4B_INCOMP 3 /* incompatible source/dest */ -#define CAUSE_I4B_REJECT 4 /* call rejected */ -#define CAUSE_I4B_OOO 5 /* destination out of order */ -#define CAUSE_I4B_TMPFAIL 6 /* temporary failure */ -#define CAUSE_I4B_L1ERROR 7 /* L1 error / persistent deact */ -#define CAUSE_I4B_MAX 8 - -/* CAUSET_Q850 - causes defined in Q.850 */ - -#define CAUSE_Q850_SHUTDN 0x00 /* normal D-channel shutdown */ -#define CAUSE_Q850_NUNALLC 0x01 /* Unallocated (unassigned) number */ -#define CAUSE_Q850_NRTTN 0x02 /* No route to specified transit network */ -#define CAUSE_Q850_NRTDST 0x03 /* No route to destination */ -#define CAUSE_Q850_SSINFTN 0x04 /* Send special information tone */ -#define CAUSE_Q850_MDIALTP 0x05 /* Misdialled trunk prefix */ -#define CAUSE_Q850_CHUNACC 0x06 /* Channel unacceptable */ -#define CAUSE_Q850_CALLAWD 0x07 /* Call awarded and being delivered in an established channel */ -#define CAUSE_Q850_PREEMPT 0x08 /* Preemption */ -#define CAUSE_Q850_PREECRR 0x09 /* Preemption - circuit reserved for reuse */ -#define CAUSE_Q850_NCCLR 0x10 /* Normal call clearing */ -#define CAUSE_Q850_USRBSY 0x11 /* User busy */ -#define CAUSE_Q850_NOUSRRSP 0x12 /* No user responding */ -#define CAUSE_Q850_NOANSWR 0x13 /* No answer from user (user alerted) */ -#define CAUSE_Q850_SUBSABS 0x14 /* Subscriber absent */ -#define CAUSE_Q850_CALLREJ 0x15 /* Call rejected */ -#define CAUSE_Q850_NUCHNG 0x16 /* Number changed */ -#define CAUSE_Q850_NONSELUC 0x1A /* Non-selected user clearing */ -#define CAUSE_Q850_DSTOOORDR 0x1B /* Destination out of order */ -#define CAUSE_Q850_INVNUFMT 0x1C /* Invalid number format */ -#define CAUSE_Q850_FACREJ 0x1D /* Facility rejected */ -#define CAUSE_Q850_STENQRSP 0x1E /* Response to STATUS ENQUIRY */ -#define CAUSE_Q850_NORMUNSP 0x1F /* Normal, unspecified */ -#define CAUSE_Q850_NOCAVAIL 0x22 /* No circuit / channel available */ -#define CAUSE_Q850_NETOOORDR 0x26 /* Network out of order */ -#define CAUSE_Q850_PFMCDOOSERV 0x27 /* Permanent frame mode connection out of service */ -#define CAUSE_Q850_PFMCOPER 0x28 /* Permanent frame mode connection operational */ -#define CAUSE_Q850_TMPFAIL 0x29 /* Temporary failure */ -#define CAUSE_Q850_SWEQCONG 0x2A /* Switching equipment congestion */ -#define CAUSE_Q850_ACCINFDIS 0x2B /* Access information discarded */ -#define CAUSE_Q850_REQCNOTAV 0x2C /* Requested circuit/channel not available */ -#define CAUSE_Q850_PRECALBLK 0x2E /* Precedence call blocked */ -#define CAUSE_Q850_RESUNAVAIL 0x2F /* Resources unavailable, unspecified */ -#define CAUSE_Q850_QOSUNAVAIL 0x31 /* Quality of service unavailable */ -#define CAUSE_Q850_REQSERVNS 0x32 /* Requested facility not subscribed */ -#define CAUSE_Q850_OCBARRCUG 0x35 /* Outgoing calls barred within CUG */ -#define CAUSE_Q850_ICBARRCUG 0x36 /* Incoming calls barred within CUG */ -#define CAUSE_Q850_BCAPNAUTH 0x39 /* Bearer capability not authorized */ -#define CAUSE_Q850_BCAPNAVAIL 0x3A /* Bearer capability not presently available */ -#define CAUSE_Q850_INCSTOACISC 0x3E /* Inconsistenciy in designated outgoing access information and subscriber class */ -#define CAUSE_Q850_SOONOTAVAIL 0x3F /* Service or option not available, unspecified */ -#define CAUSE_Q850_BCAPNOTIMPL 0x41 /* Bearer capability not implemented */ -#define CAUSE_Q850_CHTYPNIMPL 0x42 /* Channel type not implemented */ -#define CAUSE_Q850_REQFACNIMPL 0x45 /* Requested facility not implemented */ -#define CAUSE_Q850_ORDINBCAVL 0x46 /* Only restricted digital information bearer capability is available */ -#define CAUSE_Q850_SOONOTIMPL 0x4F /* Service or option not implemented, unspecified */ -#define CAUSE_Q850_INVCLRFVAL 0x51 /* Invalid call reference value */ -#define CAUSE_Q850_IDCHDNOEX 0x52 /* Identified channel does not exist */ -#define CAUSE_Q850_SUSCAEXIN 0x53 /* A suspended call exists, but this call identity does not */ -#define CAUSE_Q850_CLIDINUSE 0x54 /* Call identity in use */ -#define CAUSE_Q850_NOCLSUSP 0x55 /* No call suspended */ -#define CAUSE_Q850_CLIDCLRD 0x56 /* Call having the requested call identity has been cleared */ -#define CAUSE_Q850_UNOTMEMCUG 0x57 /* User not member of CUG */ -#define CAUSE_Q850_INCDEST 0x58 /* Incompatible destination */ -#define CAUSE_Q850_NONEXCUG 0x5A /* Non-existent CUG */ -#define CAUSE_Q850_INVNTWSEL 0x5B /* Invalid transit network selection */ -#define CAUSE_Q850_INVMSG 0x5F /* Invalid message, unspecified */ -#define CAUSE_Q850_MIEMISS 0x60 /* Mandatory information element is missing */ -#define CAUSE_Q850_MSGTNI 0x61 /* Message type non-existent or not implemented */ -#define CAUSE_Q850_MSGNCMPT 0x62 /* Message not compatible with call state or message type non-existent or not implemented */ -#define CAUSE_Q850_IENENI 0x63 /* Information element/parameter non-existent or not implemented */ -#define CAUSE_Q850_INVIEC 0x64 /* Invalid information element contents */ -#define CAUSE_Q850_MSGNCWCS 0x65 /* Message not compatible with call state */ -#define CAUSE_Q850_RECOTIMEXP 0x66 /* Recovery on timer expiry */ -#define CAUSE_Q850_PARMNENIPO 0x67 /* Parameter non-existent or not implemented, passed on */ -#define CAUSE_Q850_MSGUNRDPRM 0x6E /* Message with unrecognized parameter, discarded */ -#define CAUSE_Q850_PROTERR 0x6F /* Protocol error, unspecified */ -#define CAUSE_Q850_INTWRKU 0x7F /* Interworking, unspecified */ - -#define CAUSE_Q850_MAX 128 - -#endif /* _I4B_CAUSE_H_ */ diff --git a/sys/i386/include/i4b_debug.h b/sys/i386/include/i4b_debug.h deleted file mode 100644 index 33e6315ba285a..0000000000000 --- a/sys/i386/include/i4b_debug.h +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. - * - *--------------------------------------------------------------------------- - * - * i4b_debug.h - i4b debug header file - * ----------------------------------- - * - * $Id: i4b_debug.h,v 1.14 1998/12/05 18:05:57 hm Exp $ - * - * last edit-date: [Sat Dec 5 18:36:47 1998] - * - *---------------------------------------------------------------------------*/ - -#define DO_I4B_DEBUG /* enable debugging code inclusion */ - -#undef DO_I4B_MAXDEBUG /* enable ALL debug messages by default */ - -#ifdef DO_I4B_DEBUG - -extern unsigned int i4b_l1_debug; -extern unsigned int i4b_l2_debug; -extern unsigned int i4b_l3_debug; -extern unsigned int i4b_l4_debug; - -#define DBGL1(bits, routine, what) \ - if(bits & i4b_l1_debug) \ - { \ - printf("i4b-L1-%s: ", routine); \ - printf what ; \ - } - -#define DBGL2(bits, routine, what) \ - if(bits & i4b_l2_debug) \ - { \ - printf("i4b-L2-%s: ", routine); \ - printf what ; \ - } - -#define DBGL3(bits, routine, what) \ - if(bits & i4b_l3_debug) \ - { \ - printf("i4b-L3-%s: ", routine); \ - printf what ; \ - } - -#define DBGL4(bits, routine, what) \ - if(bits & i4b_l4_debug) \ - { \ - printf("i4b-L4-%s: ", routine); \ - printf what ; \ - } -#else /* !DO_I4B_DEBUG */ - -#define DBGL1(bits, routine, what); -#define DBGL2(bits, routine, what); -#define DBGL3(bits, routine, what); -#define DBGL4(bits, routine, what); - -#endif /* DO_I4B_DEBUG */ - -/* Layer 1 */ - -#define L1_ERROR 0x0001 /* general error message*/ -#define L1_PRIM 0x0002 /* interlayer primitives*/ -#define L1_BCHAN 0x0004 /* B channel action */ -#define L1_H_ERR 0x0008 /* HSCX errors */ -#define L1_H_IRQ 0x0010 /* HSCX IRQ messages */ -#define L1_I_ERR 0x0020 /* ISAC errors */ -#define L1_I_MSG 0x0040 /* ISAC messages */ -#define L1_I_SETUP 0x0080 /* ISAC setup messages */ -#define L1_F_MSG 0x0100 /* FSM messages */ -#define L1_F_ERR 0x0200 /* FSM error messages */ -#define L1_T_MSG 0x0400 /* Timer messages */ -#define L1_T_ERR 0x0800 /* Timer error messages */ -#define L1_H_XFRERR 0x1000 /* HSCX data xfer error */ -#define L1_I_CICO 0x2000 /* ISAC command in/out */ - -#define L1_DEBUG_MAX 0x3fef /* all messages on except IRQ! */ -#define L1_DEBUG_ERR (L1_H_ERR | L1_I_ERR | L1_F_ERR | L1_T_ERR | L1_ERROR) - -#ifndef L1_DEBUG_DEFAULT -#ifdef DO_I4B_MAXDEBUG -#define L1_DEBUG_DEFAULT L1_DEBUG_MAX -#else -#define L1_DEBUG_DEFAULT L1_DEBUG_ERR -#endif -#endif - -/* Layer 2 */ - -#define L2_ERROR 0x0001 /* general error message */ -#define L2_PRIM 0x0002 /* interlayer primitives */ -#define L2_U_MSG 0x0004 /* U frame messages */ -#define L2_U_ERR 0x0008 /* U frame error messages */ -#define L2_S_MSG 0x0010 /* S frame messages */ -#define L2_S_ERR 0x0020 /* S frame error messages */ -#define L2_I_MSG 0x0040 /* I frame messages */ -#define L2_I_ERR 0x0080 /* I frame error messages */ -#define L2_F_MSG 0x0100 /* FSM messages */ -#define L2_F_ERR 0x0200 /* FSM error messages */ -#define L2_T_MSG 0x0400 /* timer messages */ -#define L2_T_ERR 0x0800 /* timer error messages */ -#define L2_TEI_MSG 0x1000 /* TEI messages */ -#define L2_TEI_ERR 0x2000 /* TEI error messages */ - -#define L2_DEBUG_MAX 0x3fff /* all messages on */ -#define L2_DEBUG_ERR (L2_ERROR | L2_I_ERR | L2_F_ERR | L2_T_ERR | L2_S_ERR | L2_TEI_ERR | L2_U_ERR ) - -#ifndef L2_DEBUG_DEFAULT -#ifdef DO_I4B_MAXDEBUG -#define L2_DEBUG_DEFAULT L2_DEBUG_MAX -#else -#define L2_DEBUG_DEFAULT L2_DEBUG_ERR -#endif -#endif - -/* Layer 3 */ - -#define L3_ERR 0x0001 /* general error message */ -#define L3_MSG 0x0002 /* general message */ -#define L3_F_MSG 0x0004 /* FSM messages */ -#define L3_F_ERR 0x0008 /* FSM error messages */ -#define L3_T_MSG 0x0010 /* timer messages */ -#define L3_T_ERR 0x0020 /* timer error messages */ -#define L3_P_MSG 0x0040 /* protocol messages */ -#define L3_P_ERR 0x0080 /* protocol error messages */ -#define L3_A_MSG 0x0100 /* AOC messages */ -#define L3_A_ERR 0x0200 /* AOC error messages */ -#define L3_PRIM 0x0400 /* messages exchanged */ - -#define L3_DEBUG_MAX 0x07ff /* all messages on */ -#define L3_DEBUG_ERR (L3_ERR | L3_F_ERR | L3_T_ERR | L3_P_ERR | L3_A_ERR) - -#ifndef L3_DEBUG_DEFAULT -#ifdef DO_I4B_MAXDEBUG -#define L3_DEBUG_DEFAULT L3_DEBUG_MAX -#else -#define L3_DEBUG_DEFAULT L3_DEBUG_ERR -#endif -#endif - -/* Layer 4 */ - -#define L4_ERR 0x0001 /* general error message */ -#define L4_MSG 0x0002 /* general message */ -#define L4_TIMO 0x0004 /* b channel idle timeout msgs */ -#define L4_DIALST 0x0008 /* network driver dial states */ -#define L4_IPRDBG 0x0010 /* ipr driver debug messages */ -#define L4_RBCHDBG 0x0020 /* rbch driver debug messages */ - -#define L4_DEBUG_MAX 0x003f /* all messages on */ -#define L4_DEBUG_ERR (L4_ERR) - -#ifndef L4_DEBUG_DEFAULT -#ifdef DO_I4B_MAXDEBUG -#define L4_DEBUG_DEFAULT L4_DEBUG_MAX -#else -#define L4_DEBUG_DEFAULT L4_DEBUG_ERR -#endif -#endif - -/*---------------------------------------------------------------------------* - * ioctl via /dev/i4bctl: - * get/set current debug bits settings - *---------------------------------------------------------------------------*/ - -typedef struct { - unsigned int l1; - unsigned int l2; - unsigned int l3; - unsigned int l4; -} ctl_debug_t; - -#define I4B_CTL_GET_DEBUG _IOR('C', 0, ctl_debug_t) - -#define I4B_CTL_SET_DEBUG _IOW('C', 1, ctl_debug_t) - -/*---------------------------------------------------------------------------* - * get hscx statistics - *---------------------------------------------------------------------------*/ - -typedef struct { - int unit; /* controller number */ - int chan; /* channel number */ - int vfr; - int rdo; - int crc; - int rab; - int xdu; - int rfo; -} hscxstat_t; - -#define I4B_CTL_GET_HSCXSTAT _IOWR('C', 2, hscxstat_t) - -#define I4B_CTL_CLR_HSCXSTAT _IOW('C', 3, hscxstat_t) - -/* EOF */ diff --git a/sys/i386/include/i4b_ioctl.h b/sys/i386/include/i4b_ioctl.h deleted file mode 100644 index 17e945f173efa..0000000000000 --- a/sys/i386/include/i4b_ioctl.h +++ /dev/null @@ -1,606 +0,0 @@ -/* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. - * - *--------------------------------------------------------------------------- - * - * i4b_ioctl.h - messages kernel <--> userland - * ------------------------------------------- - * - * $Id: i4b_ioctl.h,v 1.58 1998/12/22 19:48:24 hm Exp $ - * - * last edit-date: [Tue Dec 22 20:33:46 1998] - * - *---------------------------------------------------------------------------*/ - -#ifndef _I4B_IOCTL_H_ -#define _I4B_IOCTL_H_ - -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 -#ifndef _MACHINE_TYPES_H_ -#include <machine/types.h> -#endif /* _MACHINE_TYPES_H_ */ -#endif /* __FreeBSD__ */ - -/*---------------------------------------------------------------------------* - * version and release number for isdn4bsd package - *---------------------------------------------------------------------------*/ -#define VERSION 0 /* version number */ -#define REL 70 /* release number */ -#define STEP 00 /* release step */ - -/*---------------------------------------------------------------------------* - * date/time format in i4b log messages - * ------------------------------------ - * Being year 2000 clean is not easy with the current state of the - * ANSI C library standard and it's implementation for some locales. - * You might like to use the "%c" format of "strftime" sometimes, - * but this breaks Y2K in some locales. Also the old standard logfile - * format "%d.%m.%y %H:%M:%S" is non compliant. - * NetBSD's current toolset warns about this problems, and we compile - * with -Werror, so this problems need to be resolved. - *---------------------------------------------------------------------------*/ -#define I4B_TIME_FORMAT "%d.%m.%Y %H:%M:%S" - -/*---------------------------------------------------------------------------* - * max number of controllers in system - *---------------------------------------------------------------------------*/ -#define MAX_CONTROLLERS 8 /* max number of controllers */ - -/*---------------------------------------------------------------------------* - * controller types - *---------------------------------------------------------------------------*/ -#define CTRL_INVALID (-1) /* invalid, error */ -#define CTRL_UNKNOWN 0 /* unknown controller type */ -#define CTRL_PASSIVE 1 /* passive ISDN controller cards*/ -#define CTRL_DAIC 2 /* Diehl active controller cards*/ -#define CTRL_NUMTYPES 3 /* number of controller types */ - -/*---------------------------------------------------------------------------* - * card types for CTRL_PASSIVE - *---------------------------------------------------------------------------*/ -#define CARD_TYPEP_INVAL (-1) /* invalid, error */ -#define CARD_TYPEP_UNK 0 /* unknown */ -#define CARD_TYPEP_8 1 /* Teles, S0/8 */ -#define CARD_TYPEP_16 2 /* Teles, S0/16 */ -#define CARD_TYPEP_16_3 3 /* Teles, S0/16.3 */ -#define CARD_TYPEP_AVMA1 4 /* AVM A1 or AVM Fritz!Card */ -#define CARD_TYPEP_163P 5 /* Teles, S0/16.3 PnP */ -#define CARD_TYPEP_CS0P 6 /* Creatix, S0 PnP */ -#define CARD_TYPEP_USRTA 7 /* US Robotics ISDN TA internal */ -#define CARD_TYPEP_DRNNGO 8 /* Dr. Neuhaus Niccy GO@ */ -#define CARD_TYPEP_SWS 9 /* Sedlbauer Win Speed */ -#define CARD_TYPEP_DYNALINK 10 /* Dynalink IS64PH */ -#define CARD_TYPEP_BLMASTER 11 /* ISDN Blaster / ISDN Master */ -#define CARD_TYPEP_PCFRITZ 12 /* AVM PCMCIA Fritz!Card */ -#define CARD_TYPEP_ELSAQS1ISA 13 /* ELSA QuickStep 1000pro ISA */ -#define CARD_TYPEP_ELSAQS1PCI 14 /* ELSA QuickStep 1000pro PCI */ -#define CARD_TYPEP_SIEMENSITALK 15 /* Siemens I-Talk */ -#define CARD_TYPEP_ELSAMLIMC 16 /* ELSA MicroLink ISDN/MC */ -#define CARD_TYPEP_ELSAMLMCALL 17 /* ELSA MicroLink MCall */ -#define CARD_TYPEP_ITKIX1 18 /* ITK ix1 micro */ - -/* - * in case you add support for more cards, please update: - * - * isdnd: support.c, name_of_controller() - * diehl/diehlctl: main.c, listall() - * - * and adjust CARD_TYPEP_MAX below. - */ - -#define CARD_TYPEP_MAX 18 /* max type */ - -/*---------------------------------------------------------------------------* - * card types for CTRL_DAIC - *---------------------------------------------------------------------------*/ -#define CARD_TYPEA_DAIC_UNK 0 -#define CARD_TYPEA_DAIC_S 1 -#define CARD_TYPEA_DAIC_SX 2 -#define CARD_TYPEA_DAIC_SCOM 3 -#define CARD_TYPEA_DAIC_QUAD 4 - -/*---------------------------------------------------------------------------* - * max length of some strings - *---------------------------------------------------------------------------*/ -#define TELNO_MAX 41 /* max length of a telephone number (+ '\0') */ -#define DISPLAY_MAX 91 /* max length of display information (+ '\0') */ -#define DATETIME_MAX 21 /* max length of datetime information (+ '\0')*/ - -/*---------------------------------------------------------------------------* - * in case the src or dst telephone number is empty - *---------------------------------------------------------------------------*/ -#define TELNO_EMPTY "NotAvailable" - -/*---------------------------------------------------------------------------* - * B channel parameters - *---------------------------------------------------------------------------*/ -#define BCH_MAX_DATALEN 2048 /* max length of a B channel frame */ - -/*---------------------------------------------------------------------------* - * userland driver types - * --------------------- - * a "driver" is defined here as a piece of software interfacing an - * ISDN B channel with a userland service, such as IP, Telephony etc. - *---------------------------------------------------------------------------*/ -#define BDRV_RBCH 0 /* raw b-channel interface driver */ -#define BDRV_TEL 1 /* telephone (speech) interface driver */ -#define BDRV_IPR 2 /* IP over raw HDLC interface driver */ -#define BDRV_ISPPP 3 /* sync Kernel PPP interface driver */ - -/*---------------------------------------------------------------------------* - * B channel protocol - *---------------------------------------------------------------------------*/ -#define BPROT_NONE 0 /* no protocol at all, raw data */ -#define BPROT_RHDLC 1 /* raw HDLC: flag, data, crc, flag */ - -/*---------------------------------------------------------------------------* - * causes data type - *---------------------------------------------------------------------------*/ -typedef unsigned int cause_t; /* 32 bit unsigned int */ - -/*---------------------------------------------------------------------------* - * call descriptor id (cdid) definitions - *---------------------------------------------------------------------------*/ -#define CDID_UNUSED 0 /* cdid is invalid and unused */ -#define CDID_MAX 99999 /* highest valid cdid, wraparound to 1 */ - - -/**************************************************************************** - - outgoing call: - -------------- - - userland kernel - -------- ------ - - CDID_REQ -----------------> - - <------------------ cdid - - CONNECT_REQ --------------> - - <------------------ PROCEEDING_IND (if connect req ok) - - <------------------ CONNECT_ACTIVE_IND (if connection ok) - - or - - <------------------ DISCONNECT_IND (if connection failed) - - - - incoming call: - -------------- - - userland kernel - -------- ------ - - <------------------ CONNECT_IND - - CONNECT_RESP -------------> - - <------------------ CONNECT_ACTIVE_IND (if accepted) - - - - active disconnect: - ------------------ - - userland kernel - -------- ------ - - DISCONNECT_REQ ------------> - - <------------------ DISCONNECT_IND - - - passive disconnect: - ------------------- - - userland kernel - -------- ------ - - <------------------ DISCONNECT_IND - - -****************************************************************************/ - - -/*===========================================================================* - *===========================================================================* - * "read" messages from kernel -> userland - *===========================================================================* - *===========================================================================*/ - - -/*---------------------------------------------------------------------------* - * message header, included in every message - *---------------------------------------------------------------------------*/ -typedef struct { - char type; /* message identifier */ -#define MSG_CONNECT_IND 'a' -#define MSG_CONNECT_ACTIVE_IND 'b' -#define MSG_DISCONNECT_IND 'c' -#define MSG_DIALOUT_IND 'd' -#define MSG_IDLE_TIMEOUT_IND 'e' -#define MSG_ACCT_IND 'f' -#define MSG_CHARGING_IND 'g' -#define MSG_PROCEEDING_IND 'h' -#define MSG_ALERT_IND 'i' -#define MSG_DRVRDISC_REQ 'j' -#define MSG_L12STAT_IND 'k' -#define MSG_TEIASG_IND 'l' -#define MSG_PDEACT_IND 'm' -#define MSG_NEGCOMP_IND 'n' -#define MSG_IFSTATE_CHANGED_IND 'o' - int cdid; /* call descriptor id */ -} msg_hdr_t; - -/*---------------------------------------------------------------------------* - * connect indication - * indicates incoming connection - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int controller; /* controller number */ - int channel; /* channel number */ -#define CHAN_B1 0 /* this _must_ be 0, HSCX B1 is also 0 */ -#define CHAN_B2 1 /* this _must_ be 1, HSCX B2 is also 1 */ -#define CHAN_ANY (-1) /* outgoing, not possible for incoming */ -#define CHAN_NO (-2) /* call waiting (CW) for incoming */ - int bprot; /* b channel protocot, see BPROT_XXX */ - char dst_telno[TELNO_MAX]; /* destination telno */ - char src_telno[TELNO_MAX]; /* source telno */ - int scr_ind;/* screening indicator */ -#define SCR_NONE 0 /* no screening indicator transmitted */ -#define SCR_USR_NOSC 1 /* screening user provided, not screened*/ -#define SCR_USR_PASS 2 /* screening user provided, verified & passed */ -#define SCR_USR_FAIL 3 /* screening user provided, verified & failed */ -#define SCR_NET 4 /* screening network provided */ - char display[DISPLAY_MAX]; /* content of display IE*/ -} msg_connect_ind_t; - -/*---------------------------------------------------------------------------* - * connect active indication - * indicates active connection - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int controller; /* controller number actually used */ - int channel; /* channel number actually used */ - char datetime[DATETIME_MAX]; /* content of date/time IE */ -} msg_connect_active_ind_t; - -/*---------------------------------------------------------------------------* - * disconnect indication - * indicates a disconnect - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - cause_t cause; /* cause code */ -} msg_disconnect_ind_t; - -/*---------------------------------------------------------------------------* - * negotiation complete - * indicates an interface is completely up & running - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ -} msg_negcomplete_ind_t; - -/*---------------------------------------------------------------------------* - * interface changes internal state - * indicates an interface has somehow switched its FSM - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int state; /* new interface state */ -} msg_ifstatechg_ind_t; - -/*---------------------------------------------------------------------------* - * initiate a call to a remote site - * i.e. the IP driver got a packet and wants a connection - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int driver; /* driver type */ - int driver_unit; /* driver unit number */ -} msg_dialout_ind_t; - -/*---------------------------------------------------------------------------* - * idle timeout disconnect sent indication - * kernel has sent disconnect request because of b-ch idle - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ -} msg_idle_timeout_ind_t; - -/*---------------------------------------------------------------------------* - * accounting information from userland interface driver to daemon - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int accttype; /* accounting type */ -#define ACCT_DURING 0 -#define ACCT_FINAL 1 - int driver; /* driver type */ - int driver_unit; /* driver unit number */ - int ioutbytes; /* ISDN # of bytes sent */ - int iinbytes; /* ISDN # of bytes received */ - int outbps; /* bytes per sec out */ - int inbps; /* bytes per sec in */ - int outbytes; /* driver # of bytes sent */ - int inbytes; /* driver # of bytes received */ -} msg_accounting_ind_t; - -/*---------------------------------------------------------------------------* - * charging information from isdn driver to daemon - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int units; /* number of units */ - int units_type; /* type of units info */ -#define CHARGE_INVALID 0 /* invalid, unknown */ -#define CHARGE_AOCD 1 /* advice of charge during call */ -#define CHARGE_AOCE 2 /* advice of charge at end of call */ -#define CHARGE_CALC 3 /* locally calculated from rates information */ -} msg_charging_ind_t; - -/*---------------------------------------------------------------------------* - * call proceeding indication - * indicates outgoing SETUP has been acknowleged - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int controller; /* controller number actually used */ - int channel; /* channel number actually used */ -} msg_proceeding_ind_t; - -/*---------------------------------------------------------------------------* - * alert indication - * indicates remote user side "rings" - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ -} msg_alert_ind_t; - -/*---------------------------------------------------------------------------* - * driver requests to disconnect line - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int driver; /* driver type */ - int driver_unit; /* driver unit number */ -} msg_drvrdisc_req_t; - -/*---------------------------------------------------------------------------* - * state of layer 1/2 - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int controller; /* controller unit */ - int layer; /* layer number (1/2) */ -#define LAYER_ONE 1 -#define LAYER_TWO 2 - int state; /* state info */ -#define LAYER_IDLE 0 -#define LAYER_ACTIVE 1 -} msg_l12stat_ind_t; - -/*---------------------------------------------------------------------------* - * TEI assignment messages - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int controller; /* controller unit */ - int tei; /* TEI or -1 if invalid */ -} msg_teiasg_ind_t; - -/*---------------------------------------------------------------------------* - * persistent deactivation state of stack - *---------------------------------------------------------------------------*/ -typedef struct { - msg_hdr_t header; /* common header */ - int controller; /* controller unit */ - int numactive; /* number of active connections */ -} msg_pdeact_ind_t; - - -/*===========================================================================* - *===========================================================================* - * "ioctl" messages from userland -> kernel - *===========================================================================* - *===========================================================================*/ - - -/*---------------------------------------------------------------------------* - * request a unique cdid (to setup an outgoing call) - *---------------------------------------------------------------------------*/ -typedef struct { - int cdid; /* call descriptor id */ -} msg_cdid_req_t; - -#define I4B_CDID_REQ _IOWR('4', 0, int) - -/*---------------------------------------------------------------------------* - * connect request - * requests an outgoing connection - *---------------------------------------------------------------------------*/ -typedef struct { - int cdid; /* call descriptor id */ - int controller; /* controller to use */ - int channel; /* channel to use */ - int txdelay; /* tx delay after connect */ - int bprot; /* b channel protocol */ - int driver; /* driver to route b channel data to */ - int driver_unit; /* unit number for above driver */ - int unitlen_time; /* length of a charging unit */ - int idle_time; /* time without activity on b ch */ - int earlyhup_time; /* safety area at end of unit */ - int unitlen_method; /* how to calculate the unitlength */ -#define ULEN_METHOD_STATIC 0 /* use unitlen_time value (see above) */ -#define ULEN_METHOD_DYNAMIC 1 /* use AOCD */ - char dst_telno[TELNO_MAX]; /* destination telephone no */ - char src_telno[TELNO_MAX]; /* source telephone number */ -} msg_connect_req_t; - -#define I4B_CONNECT_REQ _IOW('4', 1, msg_connect_req_t) - -/*---------------------------------------------------------------------------* - * connect response - * this is the answer to an incoming connect indication - *---------------------------------------------------------------------------*/ -typedef struct { - int cdid; /* call descriptor id */ - int response; /* what to do with incoming call */ -#define SETUP_RESP_DNTCRE 0 /* dont care, call is not for me */ -#define SETUP_RESP_REJECT 1 /* reject call */ -#define SETUP_RESP_ACCEPT 2 /* accept call */ - cause_t cause; /* cause for case SETUP_RESP_REJECT */ - /* the following are only used for SETUP_RESP_ACCEPT !! */ - int txdelay; /* tx delay after connect */ - int bprot; /* B chan protocol */ - int driver; /* driver to route b channel data to */ - int driver_unit; /* unit number for above driver */ - int max_idle_time; /* max time without activity on b ch */ -} msg_connect_resp_t; - -#define I4B_CONNECT_RESP _IOW('4', 2, msg_connect_resp_t) - -/*---------------------------------------------------------------------------* - * disconnect request - * active disconnect request - *---------------------------------------------------------------------------*/ -typedef struct { - int cdid; /* call descriptor id */ - cause_t cause; /* protocol independent cause */ -} msg_discon_req_t; - -#define I4B_DISCONNECT_REQ _IOW('4', 3, msg_discon_req_t) - -/*---------------------------------------------------------------------------* - * controller info request - *---------------------------------------------------------------------------*/ -typedef struct { - int controller; /* controller number */ - int ncontroller; /* number of controllers in system */ - int ctrl_type; /* controller type passive/active */ - int card_type; /* brand / version */ - int tei; /* tei controller probably has */ -} msg_ctrl_info_req_t; - -#define I4B_CTRL_INFO_REQ _IOWR('4', 4, msg_ctrl_info_req_t) - -/*---------------------------------------------------------------------------* - * dialout response - * status report to driver who requested a dialout - *---------------------------------------------------------------------------*/ -typedef struct { - int driver; /* driver to route b channel data to */ - int driver_unit; /* unit number for above driver */ - int stat; /* state of dialout request */ -#define DSTAT_NONE 0 -#define DSTAT_TFAIL 1 /* transient failure */ -#define DSTAT_PFAIL 2 /* permanent failure */ -#define DSTAT_INONLY 3 /* no outgoing dials allowed */ -} msg_dialout_resp_t; - -#define I4B_DIALOUT_RESP _IOW('4', 5, msg_dialout_resp_t) - -/*---------------------------------------------------------------------------* - * timeout value update - *---------------------------------------------------------------------------*/ -typedef struct { - int cdid; /* call descriptor id */ - int unitlen_time; /* length of a charging unit */ - int idle_time; /* time without activity on b ch */ - int earlyhup_time; /* safety area at end of unit */ -} msg_timeout_upd_t; - -#define I4B_TIMEOUT_UPD _IOW('4', 6, msg_timeout_upd_t) - -/*---------------------------------------------------------------------------* - * soft enable/disable - *---------------------------------------------------------------------------*/ -typedef struct { - int driver; /* driver to route b channel data to */ - int driver_unit; /* unit number for above driver */ - int updown; /* what to do */ -#define SOFT_ENA 0 /* enable interface */ -#define SOFT_DIS 1 /* disable interface */ -} msg_updown_ind_t; - -#define I4B_UPDOWN_IND _IOW('4', 7, msg_updown_ind_t) - -/*---------------------------------------------------------------------------* - * send alert request - *---------------------------------------------------------------------------*/ -typedef struct { - int cdid; /* call descriptor id */ -} msg_alert_req_t; - -#define I4B_ALERT_REQ _IOW('4', 8, msg_alert_req_t) - -/*---------------------------------------------------------------------------* - * request version and release info from kernel part - *---------------------------------------------------------------------------*/ -typedef struct { - int version; /* version number */ - int release; /* release number */ - int step; /* release step number */ -} msg_vr_req_t; - -#define I4B_VR_REQ _IOR('4', 9, msg_vr_req_t) - -/*---------------------------------------------------------------------------* - * Protocol download to active cards - *---------------------------------------------------------------------------*/ -struct isdn_dr_prot { - size_t bytecount; /* length of code */ - u_int8_t *microcode; /* pointer to microcode */ -}; - -struct isdn_download_request { - int controller; /* controller number */ - int numprotos; /* number of protocols in 'protocols' */ - struct isdn_dr_prot *protocols; -}; - -#define I4B_CTRL_DOWNLOAD _IOW('4', 100, struct isdn_download_request) - -/*---------------------------------------------------------------------------* - * Generic diagnostic interface for active cards - *---------------------------------------------------------------------------*/ -struct isdn_diagnostic_request { - int controller; /* controller number */ - u_int32_t cmd; /* diagnostic command to execute */ - size_t in_param_len; /* length of additional input parameter */ - void *in_param; /* optional input parameter */ - size_t out_param_len; /* available output space */ - void *out_param; /* output data goes here */ -}; - -#define I4B_ACTIVE_DIAGNOSTIC _IOW('4', 102, struct isdn_diagnostic_request) - -#endif /* _I4B_IOCTL_H_ */ diff --git a/sys/i386/include/i4b_tel_ioctl.h b/sys/i386/include/i4b_tel_ioctl.h deleted file mode 100644 index b7f0f73cd92a5..0000000000000 --- a/sys/i386/include/i4b_tel_ioctl.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. - * - *--------------------------------------------------------------------------- - * - * i4b_tel_ioctl.h telephony interface ioctls - * ------------------------------------------ - * - * $Id: i4b_tel_ioctl.h,v 1.5 1998/12/14 10:31:58 hm Exp $ - * - * last edit-date: [Sat Dec 5 18:37:36 1998] - * - *---------------------------------------------------------------------------*/ - -#ifndef _I4B_TEL_IOCTL_H_ -#define _I4B_TEL_IOCTL_H_ - -/* supported audio format conversions for /dev/i4btelXX devices */ - -#define CVT_NONE 0 /* no format conversion */ -#define CVT_ALAW2ULAW 1 /* kernel A-law, userland mu-law */ - -/*---------------------------------------------------------------------------* - * get / set audio format - *---------------------------------------------------------------------------*/ - -#define I4B_TEL_GETAUDIOFMT _IOR('A', 0, int) -#define I4B_TEL_SETAUDIOFMT _IOW('A', 1, int) -#define I4B_TEL_EMPTYINPUTQUEUE _IOW('A', 2, int) - -#endif /* _I4B_TEL_IOCTL_H_ */ diff --git a/sys/i386/include/i4b_trace.h b/sys/i386/include/i4b_trace.h deleted file mode 100644 index 07e08daa075cb..0000000000000 --- a/sys/i386/include/i4b_trace.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 1997, 1998 Hellmuth Michaelis. 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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. - * - *--------------------------------------------------------------------------- - * - * i4b_trace.h - header file for trace data read device - * ---------------------------------------------------- - * - * $Id: i4b_trace.h,v 1.5 1998/12/05 18:06:01 hm Exp $ - * - * last edit-date: [Sat Dec 5 18:37:49 1998] - * - *---------------------------------------------------------------------------*/ - -#ifndef _I4B_TRACE_H_ -#define _I4B_TRACE_H_ - -/*---------------------------------------------------------------------------* - * structure of the header at the beginning of every trace mbuf - *---------------------------------------------------------------------------*/ -typedef struct { - int length; /* length of the following mbuf */ - int unit; /* controller unit number */ - int type; /* type of channel */ -#define TRC_CH_I 0 /* Layer 1 INFO's */ -#define TRC_CH_D 1 /* D channel */ -#define TRC_CH_B1 2 /* B1 channel */ -#define TRC_CH_B2 3 /* B2 channel */ - int dir; /* direction */ -#define FROM_TE 0 /* user -> network */ -#define FROM_NT 1 /* network -> user */ - int trunc; /* # of truncated bytes (frame > MCLBYTES) */ - unsigned int count; /* frame count for this unit/type */ - struct timeval time; /* timestamp for this frame */ -} i4b_trace_hdr_t; - -#define INFO0 0 /* layer 1 */ -#define INFO1_8 1 -#define INFO1_10 2 -#define INFO2 3 -#define INFO3 4 -#define INFO4_8 5 -#define INFO4_10 6 - -/*---------------------------------------------------------------------------* - * ioctl via /dev/i4btrc device(s): - * get/set current trace flag settings - *---------------------------------------------------------------------------*/ - -#define I4B_TRC_GET _IOR('T', 0, int) /* get trace settings */ -#define I4B_TRC_SET _IOW('T', 1, int) /* set trace settings */ - -#define TRACE_OFF 0x00 /* tracing off */ -#define TRACE_I 0x01 /* trace L1 INFO's on */ -#define TRACE_D_TX 0x02 /* trace D channel on */ -#define TRACE_D_RX 0x04 /* trace D channel on */ -#define TRACE_B_TX 0x08 /* trace B channel on */ -#define TRACE_B_RX 0x10 /* trace B channel on */ - -typedef struct { - int rxunit; /* unit # for rx frames */ - int rxflags; /* d and/or b channel */ - int txunit; /* unit # for tx frames */ - int txflags; /* d and/or b channel */ -} i4b_trace_setupa_t; - -#define I4B_TRC_SETA _IOW('T', 2, i4b_trace_setupa_t) /* set analyze mode */ -#define I4B_TRC_RESETA _IOW('T', 3, int) /* reset analyze mode */ - -#endif /* _I4B_TRACE_H_ */ diff --git a/sys/i386/include/iic.h b/sys/i386/include/iic.h index 6649821e0240a..174432611c0c9 100644 --- a/sys/i386/include/iic.h +++ b/sys/i386/include/iic.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: iic.h,v 1.1 1998/09/03 21:00:08 nsouch Exp $ + * $Id: iic.h,v 1.1.2.1 1998/07/17 00:54:01 son Exp $ * */ #ifndef __IIC_H @@ -31,17 +31,10 @@ #include <sys/ioccom.h> -struct iiccmd { - u_char slave; - int count; - int last; - char *buf; -}; - -#define I2CSTART _IOW('i', 1, struct iiccmd) /* start condition */ -#define I2CSTOP _IO('i', 2) /* stop condition */ -#define I2CRSTCARD _IOW('i', 3, struct iiccmd) /* reset the card */ -#define I2CWRITE _IOW('i', 4, struct iiccmd) /* send data */ -#define I2CREAD _IOW('i', 5, struct iiccmd) /* receive data */ +#define I2CSTART _IO('i', 1) /* start condition */ +#define I2CSTOP _IO('i', 2) /* stop condition */ +#define I2CADDRESS _IOW('i', 3, long) /* address bus */ +#define I2CRSTCARD _IOW('i', 4, long) /* reset the card */ #endif + diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h index fd7bcfd2c661f..a565266783452 100644 --- a/sys/i386/include/md_var.h +++ b/sys/i386/include/md_var.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: md_var.h,v 1.27 1998/10/30 05:41:15 msmith Exp $ + * $Id: md_var.h,v 1.25 1998/09/14 22:43:40 jdp Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -38,12 +38,7 @@ extern int Maxmem; extern u_int atdevbase; /* offset in virtual memory of ISA io mem */ -extern void (*bcopy_vector) __P((const void *from, void *to, size_t len)); extern int busdma_swi_pending; -extern int (*copyin_vector) __P((const void *udaddr, void *kaddr, - size_t len)); -extern int (*copyout_vector) __P((const void *kaddr, void *udaddr, - size_t len)); extern u_int cpu_feature; extern u_int cpu_high; extern u_int cpu_id; @@ -56,7 +51,6 @@ extern int need_post_dma_flush; #endif extern void (*netisrs[32]) __P((void)); extern int nfs_diskless_valid; -extern void (*ovbcopy_vector) __P((const void *from, void *to, size_t len)); extern char sigcode[]; extern int szsigcode; @@ -68,6 +62,7 @@ struct fpreg; void bcopyb __P((const void *from, void *to, size_t len)); void busdma_swi __P((void)); void cpu_halt __P((void)); +void cpu_power_down __P((void)); void cpu_reset __P((void)); void cpu_switch_load_fs __P((void)) __asm(__STRING(cpu_switch_load_fs)); void cpu_switch_load_gs __P((void)) __asm(__STRING(cpu_switch_load_gs)); @@ -80,12 +75,6 @@ void doreti_popl_es_fault __P((void)) __asm(__STRING(doreti_popl_es_fault)); int fill_fpregs __P((struct proc *, struct fpreg *)); int fill_regs __P((struct proc *p, struct reg *regs)); void fillw __P((int /*u_short*/ pat, void *base, size_t cnt)); -void i486_bzero __P((void *buf, size_t len)); -void i586_bcopy __P((const void *from, void *to, size_t len)); -void i586_bzero __P((void *buf, size_t len)); -int i586_copyin __P((const void *udaddr, void *kaddr, size_t len)); -int i586_copyout __P((const void *kaddr, void *udaddr, size_t len)); -void i686_pagezero __P((void *addr)); int is_physical_memory __P((vm_offset_t addr)); u_long kvtop __P((void *addr)); void setidt __P((int idx, alias_for_inthand_t *func, int typ, int dpl, diff --git a/sys/i386/include/mouse.h b/sys/i386/include/mouse.h index b6ecef777bee4..27ec8e1fe94ab 100644 --- a/sys/i386/include/mouse.h +++ b/sys/i386/include/mouse.h @@ -20,7 +20,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: mouse.h,v 1.10 1998/06/14 20:05:22 ahasty Exp $ + * $Id: mouse.h,v 1.9 1997/12/07 08:08:50 yokota Exp $ */ #ifndef _MACHINE_MOUSE_H_ @@ -113,7 +113,6 @@ typedef struct mousehw { #define MOUSE_MODEL_THINK 5 #define MOUSE_MODEL_EASYSCROLL 6 #define MOUSE_MODEL_MOUSEMANPLUS 7 -#define MOUSE_MODEL_KIDSPAD 8 typedef struct mousemode { int protocol; /* MOUSE_PROTO_XXX */ @@ -141,7 +140,6 @@ typedef struct mousemode { #define MOUSE_PROTO_THINK 11 /* Kensignton Thinking Mouse, 3/4 bytes */ #define MOUSE_PROTO_SYSMOUSE 12 /* /dev/sysmouse */ #define MOUSE_PROTO_X10MOUSEREM 13 /* X10 MouseRemote, 3 bytes */ -#define MOUSE_PROTO_KIDSPAD 14 /* Genius Kidspad */ #define MOUSE_RES_UNKNOWN (-1) #define MOUSE_RES_DEFAULT 0 diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h index ce0043945af6d..e03b9ad66f7b9 100644 --- a/sys/i386/include/param.h +++ b/sys/i386/include/param.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $Id: param.h,v 1.47 1998/10/13 08:24:37 dg Exp $ + * $Id: param.h,v 1.46 1998/09/09 01:21:25 jdp Exp $ */ #ifndef _MACHINE_PARAM_H_ @@ -54,7 +54,11 @@ * that are supported on the architecture. */ #define OBJFORMAT_NAMES "elf", "aout" +#ifdef __ELF__ #define OBJFORMAT_DEFAULT "elf" +#else +#define OBJFORMAT_DEFAULT "aout" +#endif #ifdef SMP #define NCPUS 2 diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h index 16b07098aad14..0f4dd6b931716 100644 --- a/sys/i386/include/pc/vesa.h +++ b/sys/i386/include/pc/vesa.h @@ -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: vesa.h,v 1.3 1999/01/08 12:57:06 yokota Exp $ + * $Id: vesa.h,v 1.1 1998/09/15 18:16:37 sos Exp $ */ #ifndef _MACHINE_PC_VESA_H @@ -115,6 +115,10 @@ struct vesa_mode int vesa_load_ioctl(void); int vesa_unload_ioctl(void); +#ifndef VESA_MODULE +int vesa_load(void); +#endif + #endif /* KERNEL */ #endif /* !_MACHINE_PC_VESA_H */ diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h index 5251be3890c79..25bfc624c8eb4 100644 --- a/sys/i386/include/pmap.h +++ b/sys/i386/include/pmap.h @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $Id: pmap.h,v 1.56 1998/06/21 14:08:27 mckay Exp $ + * $Id: pmap.h,v 1.55 1998/05/11 01:05:59 dyson Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -237,10 +237,9 @@ typedef struct pv_entry { #define NPPROVMTRR 8 #define PPRO_VMTRRphysBase0 0x200 #define PPRO_VMTRRphysMask0 0x201 -struct ppro_vmtrr { +struct { u_int64_t base, mask; -}; -extern struct ppro_vmtrr PPro_vmtrr[NPPROVMTRR]; +} PPro_vmtrr[NPPROVMTRR]; extern caddr_t CADDR1; extern pt_entry_t *CMAP1; diff --git a/sys/i386/include/resource.h b/sys/i386/include/resource.h deleted file mode 100644 index 0307182216902..0000000000000 --- a/sys/i386/include/resource.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 1998 Massachusetts Institute of Technology - * - * Permission to use, copy, modify, and distribute this software and - * its documentation for any purpose and without fee is hereby - * granted, provided that both the above copyright notice and this - * permission notice appear in all copies, that both the above - * copyright notice and this permission notice appear in all - * supporting documentation, and that the name of M.I.T. not be used - * in advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. M.I.T. makes - * no representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied - * warranty. - * - * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS - * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT - * SHALL M.I.T. 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. - */ - -#ifndef _MACHINE_RESOURCE_H_ -#define _MACHINE_RESOURCE_H_ 1 - -/* - * Definitions of resource types for Intel Architecture machines - * with support for legacy ISA devices and drivers. - */ - -#define SYS_RES_IRQ 1 -#define SYS_RES_DRQ 2 -#define SYS_RES_MEMORY 3 -#define SYS_RES_IOPORT 4 - -#endif /* !_MACHINE_RESOURCE_H_ */ diff --git a/sys/i386/include/smb.h b/sys/i386/include/smb.h index e0ebef8b2dd4c..1338a15658b7d 100644 --- a/sys/i386/include/smb.h +++ b/sys/i386/include/smb.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: smb.h,v 1.1 1998/09/03 21:00:08 nsouch Exp $ + * $Id: smb.h,v 1.1 1998/08/13 17:13:20 son Exp $ * */ #ifndef __SMB_H @@ -34,7 +34,6 @@ struct smbcmd { char cmd; int count; - u_char slave; union { char byte; short word; @@ -49,8 +48,8 @@ struct smbcmd { } data; }; -#define SMB_QUICK_WRITE _IOW('i', 1, struct smbcmd) -#define SMB_QUICK_READ _IOW('i', 2, struct smbcmd) +#define SMB_QUICK_WRITE _IO('i', 1) +#define SMB_QUICK_READ _IO('i', 2) #define SMB_SENDB _IOW('i', 3, struct smbcmd) #define SMB_RECVB _IOW('i', 4, struct smbcmd) #define SMB_WRITEB _IOW('i', 5, struct smbcmd) diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h index f28d633cbd3c3..fa4d88f9cbc2a 100644 --- a/sys/i386/include/types.h +++ b/sys/i386/include/types.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $Id: types.h,v 1.15 1998/07/14 05:09:43 bde Exp $ + * $Id: types.h,v 1.14 1998/07/10 02:27:15 bde Exp $ */ #ifndef _MACHINE_TYPES_H_ @@ -52,16 +52,33 @@ typedef __int64_t vm_ooffset_t; typedef unsigned int vm_pindex_t; typedef unsigned int vm_size_t; -typedef __int32_t register_t; +/* + * Basic integral types. Omit the typedef if + * not possible for a machine/compiler combination. + */ +typedef __signed char int8_t; +typedef unsigned char u_int8_t; +typedef short int16_t; +typedef unsigned short u_int16_t; +typedef int int32_t; +typedef unsigned int u_int32_t; +typedef __int64_t int64_t; +typedef __uint64_t u_int64_t; + +typedef int32_t register_t; +typedef int32_t ufs_daddr_t; #ifdef KERNEL typedef int intfptr_t; typedef unsigned int uintfptr_t; +typedef int intptr_t; +typedef unsigned int uintptr_t; +typedef __uint64_t uoff_t; #endif /* Interrupt mask (spl, xxx_imask, etc) */ -typedef __uint32_t intrmask_t; +typedef u_int32_t intrmask_t; /* Interrupt handler function type. */ typedef void inthand2_t __P((void *_cookie)); |