summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/hfa/fore.h9
-rw-r--r--sys/dev/hfa/fore_aali.h8
-rw-r--r--sys/dev/hfa/fore_command.c6
-rw-r--r--sys/dev/hfa/fore_globals.c13
-rw-r--r--sys/dev/hfa/fore_include.h2
-rw-r--r--sys/dev/hfa/fore_init.c6
-rw-r--r--sys/dev/hfa/fore_intr.c15
-rw-r--r--sys/dev/hfa/fore_load.c21
-rw-r--r--sys/dev/hfa/fore_var.h7
-rw-r--r--sys/netatm/atm_cm.h8
-rw-r--r--sys/netatm/atm_if.h4
-rw-r--r--sys/netatm/atm_pcb.h4
-rw-r--r--sys/netatm/atm_sigmgr.h8
-rw-r--r--sys/netatm/atm_stack.h4
-rw-r--r--sys/netatm/atm_sys.h4
-rw-r--r--sys/netatm/atm_var.h4
-rw-r--r--sys/netatm/atm_vc.h4
-rw-r--r--sys/netatm/ipatm/ipatm_var.h8
-rw-r--r--sys/netatm/kern_include.h5
-rw-r--r--sys/netatm/port.h8
-rw-r--r--sys/netatm/sigpvc/sigpvc_var.h12
-rw-r--r--sys/netatm/spans/spans_cls.h4
-rw-r--r--sys/netatm/spans/spans_var.h12
-rw-r--r--sys/netatm/uni/sscf_uni_var.h4
-rw-r--r--sys/netatm/uni/sscop_var.h4
-rw-r--r--sys/netatm/uni/uniip_var.h12
-rw-r--r--sys/netatm/uni/unisig_var.h12
27 files changed, 62 insertions, 146 deletions
diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h
index 0409982..5b43cae 100644
--- a/sys/dev/hfa/fore.h
+++ b/sys/dev/hfa/fore.h
@@ -66,16 +66,7 @@
*/
#define BUF_MIN_VCC 4 /* Minimum for buffer supply calculations */
-#ifdef FORE_SBUS
-#if defined(sun4c)
-#define BUF_DATA_ALIGN 32 /* Fore-required data alignment */
-#elif defined(sun4m)
-#define BUF_DATA_ALIGN 64 /* Fore-required data alignment */
-#endif
-#endif
-#ifdef FORE_PCI
#define BUF_DATA_ALIGN 4 /* Fore-required data alignment */
-#endif
#if defined(BSD)
/*
diff --git a/sys/dev/hfa/fore_aali.h b/sys/dev/hfa/fore_aali.h
index c5bf803..ccf3922 100644
--- a/sys/dev/hfa/fore_aali.h
+++ b/sys/dev/hfa/fore_aali.h
@@ -125,7 +125,7 @@ typedef volatile struct buf_strategy Buf_strategy;
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Common Queue Element
*
@@ -333,7 +333,7 @@ typedef volatile unsigned long Cmd_code;
#define CMD_GET_PROM 0x09 /* Get PROM data */
#define CMD_INTR_REQ 0x80 /* Request host interrupt */
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
@@ -359,7 +359,7 @@ struct init_parms {
typedef volatile struct init_parms Init_parms;
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure defining the parameters for the Activate commands
*/
@@ -464,7 +464,7 @@ struct cmd_queue {
#define cmdq_prom cmdq_u.cmdqu_prom
typedef volatile struct cmd_queue Cmd_queue;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index 5823a36..75df3ec 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -94,7 +94,6 @@ fore_cmd_allocate(fup)
}
fup->fu_stats = (Fore_stats *) memp;
-#ifdef FORE_PCI
/*
* Allocate memory for PROM buffer
*/
@@ -103,7 +102,6 @@ fore_cmd_allocate(fup)
return (1);
}
fup->fu_prom = (Fore_prom *) memp;
-#endif
return (0);
}
@@ -312,7 +310,6 @@ fore_cmd_drain(fup)
wakeup((caddr_t)&fup->fu_stats);
break;
-#ifdef FORE_PCI
case CMD_GET_PROM:
if (*hcp->hcq_status & QSTAT_ERROR) {
/*
@@ -353,7 +350,6 @@ fore_cmd_drain(fup)
DMA_FREE_ADDR(fup->fu_prom, fup->fu_promd,
sizeof(Fore_prom), 0);
break;
-#endif /* FORE_PCI */
default:
log(LOG_ERR, "fore_cmd_drain: unknown command %ld\n",
@@ -418,7 +414,6 @@ fore_cmd_free(fup)
fup->fu_stats = NULL;
}
-#ifdef FORE_PCI
/*
* Free the PROM buffer
*/
@@ -426,7 +421,6 @@ fore_cmd_free(fup)
atm_dev_free(fup->fu_prom);
fup->fu_prom = NULL;
}
-#endif
/*
* Free the status words
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index ff8cc6c..b2e14b4 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -41,19 +41,6 @@
__RCSID("@(#) $FreeBSD$");
#endif
-
-/*
- * Supported device models
- */
-Fore_device fore_devices[] = {
-#ifdef FORE_SBUS
- {SBA200E_PROM_NAME, DEV_FORE_SBA200E},
- {SBA200_PROM_NAME, DEV_FORE_SBA200},
-#endif
- {""}
-};
-
-
/*
* Device unit table
*/
diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h
index 4ffe4ce..ef455d5 100644
--- a/sys/dev/hfa/fore_include.h
+++ b/sys/dev/hfa/fore_include.h
@@ -51,10 +51,8 @@
#endif
#endif
-#ifdef FORE_PCI
#include <pci/pcireg.h>
#include <pci/pcivar.h>
-#endif
#include <dev/hfa/fore.h>
#include <dev/hfa/fore_aali.h>
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index d0e6192..5ec2104 100644
--- a/sys/dev/hfa/fore_init.c
+++ b/sys/dev/hfa/fore_init.c
@@ -45,9 +45,7 @@ __RCSID("@(#) $FreeBSD$");
/*
* Local functions
*/
-#ifdef FORE_PCI
static void fore_get_prom __P((Fore_unit *));
-#endif
/*
@@ -241,14 +239,11 @@ fore_initialize_complete(fup)
*/
fup->fu_flags |= CUF_INITED;
-#ifdef FORE_PCI
fore_get_prom(fup);
-#endif
return;
}
-#ifdef FORE_PCI
/*
* Get device PROM values from CP
*
@@ -311,5 +306,4 @@ fore_get_prom(fup)
return;
}
-#endif /* FORE_PCI */
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index aa7f05c..65eb14f 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_intr.c
@@ -129,11 +129,7 @@ fore_intr(arg)
/*
* Has this card issued an interrupt??
*/
-#ifdef FORE_PCI
if (*fup->fu_psr) {
-#else
- if (aap->aali_intr_sent) {
-#endif
/*
* Indicate that we've serviced an interrupt.
@@ -147,20 +143,9 @@ fore_intr(arg)
*/
switch (fup->fu_config.ac_device) {
-#ifdef FORE_SBUS
- case DEV_FORE_SBA200E:
- SBA200E_HCR_SET(*fup->fu_ctlreg, SBA200E_CLR_SBUS_INTR);
- break;
-
- case DEV_FORE_SBA200:
- *fup->fu_ctlreg = SBA200_CLR_SBUS_INTR;
- break;
-#endif
-#ifdef FORE_PCI
case DEV_FORE_PCA200E:
PCA200E_HCR_SET(*fup->fu_ctlreg, PCA200E_CLR_HBUS_INT);
break;
-#endif
}
aap->aali_intr_sent = CP_WRITE(0);
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index 4748f58..1590891 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -520,26 +520,6 @@ fore_reset(fup)
switch (fup->fu_config.ac_device) {
-#ifdef FORE_SBUS
- case DEV_FORE_SBA200E:
- /*
- * Reset i960 by setting and clearing RESET
- */
- SBA200E_HCR_INIT(*fup->fu_ctlreg, SBA200E_RESET);
- SBA200E_HCR_CLR(*fup->fu_ctlreg, SBA200E_RESET);
- break;
-
- case DEV_FORE_SBA200:
- /*
- * Reset i960 by setting and clearing RESET
- *
- * SBA200 will NOT reset if bit is OR'd in!
- */
- *fup->fu_ctlreg = SBA200_RESET;
- *fup->fu_ctlreg = SBA200_RESET_CLR;
- break;
-#endif /* FORE_SBUS */
-#ifdef FORE_PCI
case DEV_FORE_PCA200E:
/*
* Reset i960 by setting and clearing RESET
@@ -549,7 +529,6 @@ fore_reset(fup)
PCA200E_HCR_CLR(*fup->fu_ctlreg, PCA200E_RESET);
break;
-#endif
}
}
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index 540ec12..5f844e8 100644
--- a/sys/dev/hfa/fore_var.h
+++ b/sys/dev/hfa/fore_var.h
@@ -164,14 +164,9 @@ typedef struct buf_handle Buf_handle;
struct fore_unit {
Cmn_unit fu_cmn; /* Common unit stuff */
Fore_reg *fu_ctlreg; /* Device control register */
-#ifdef FORE_SBUS
- Fore_reg *fu_intlvl; /* Interrupt level register */
-#endif
-#ifdef FORE_PCI
Fore_reg *fu_imask; /* Interrupt mask register */
Fore_reg *fu_psr; /* PCI specific register */
pcici_t fu_pcitag; /* PCI tag */
-#endif
Fore_mem *fu_ram; /* Device RAM */
u_int fu_ramsize; /* Size of device RAM */
Mon960 *fu_mon; /* Monitor program interface */
@@ -226,10 +221,8 @@ struct fore_unit {
Fore_stats *fu_statsd; /* Device statistics buffer (DMA) */
time_t fu_stats_time; /* Last stats request timestamp */
int fu_stats_ret; /* Stats request return code */
-#ifdef FORE_PCI
Fore_prom *fu_prom; /* Device PROM buffer */
Fore_prom *fu_promd; /* Device PROM buffer (DMA) */
-#endif
struct callout_handle fu_thandle; /* Timer handle */
};
typedef struct fore_unit Fore_unit;
diff --git a/sys/netatm/atm_cm.h b/sys/netatm/atm_cm.h
index 0507caa..bbeb18a 100644
--- a/sys/netatm/atm_cm.h
+++ b/sys/netatm/atm_cm.h
@@ -45,7 +45,7 @@ struct atm_connection;
struct atm_attributes;
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure used to define a kernel ATM endpoint service module and its
* associated entry points. An endpoint service is defined as a kernel
@@ -94,7 +94,7 @@ struct atm_endpoint {
__P((void *, KBuffer *, u_int));
};
typedef struct atm_endpoint Atm_endpoint;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* Endpoint IDs
@@ -230,7 +230,7 @@ typedef struct atm_attributes Atm_attributes;
#define CMAPI_SSCOP 2 /* Reliable data (SSCOP) */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* ATM Connection Instance
*
@@ -343,6 +343,6 @@ struct atm_cm_stat {
u_long cms_rcvconn; /* Packets dropped, bad conn state */
u_long cms_rcvconnvc; /* Packets dropped, bad connvc state */
};
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_CM_H */
diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h
index 3664cba..e7370c6 100644
--- a/sys/netatm/atm_if.h
+++ b/sys/netatm/atm_if.h
@@ -142,7 +142,7 @@ struct atm_config {
typedef struct atm_config Atm_config;
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Common structure used to define each physical ATM device interface.
* This structure will (normally) be embedded at the top of each driver's
@@ -381,6 +381,6 @@ typedef atm_intr_t *atm_intr_func_t; /* Pointer to callback function */
extern int atm_intr_index;
#define SCHED_ATM schednetisr(atm_intr_index)
#endif
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_IF_H */
diff --git a/sys/netatm/atm_pcb.h b/sys/netatm/atm_pcb.h
index b5518e8..af273fa 100644
--- a/sys/netatm/atm_pcb.h
+++ b/sys/netatm/atm_pcb.h
@@ -39,7 +39,7 @@
#define _NETATM_ATM_PCB_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* ATM Socket PCB
*
@@ -87,6 +87,6 @@ struct atm_sock_stat {
u_long as_indrop[ATPT_NUM]; /* Input packets dropped */
u_long as_outdrop[ATPT_NUM]; /* Output packets dropped */
};
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_PCB_H */
diff --git a/sys/netatm/atm_sigmgr.h b/sys/netatm/atm_sigmgr.h
index bd502a3..6b1d63d 100644
--- a/sys/netatm/atm_sigmgr.h
+++ b/sys/netatm/atm_sigmgr.h
@@ -38,7 +38,7 @@
#ifndef _NETATM_ATM_SIGMGR_H
#define _NETATM_ATM_SIGMGR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure common to all ATM Signalling Managers. Each Signalling
* Manager must create one of these and use it to register itself
@@ -66,7 +66,7 @@ struct sigmgr {
int (*sm_ioctl) /* Ioctl handler */
__P((int, caddr_t, caddr_t));
};
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* ATM Signalling Protocols
@@ -78,7 +78,7 @@ struct sigmgr {
#define ATM_SIG_UNI40 5 /* ATM Forum UNI 4.0 */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Signalling Protocol Instance control block header. Common header for
* every signalling protocol instance control block.
@@ -104,6 +104,6 @@ struct siginst {
#define CALL_CONNECTED 3 /* Connection setup successful */
#define CALL_CLEARED 4 /* Connection has been terminated */
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_SIGMGR_H */
diff --git a/sys/netatm/atm_stack.h b/sys/netatm/atm_stack.h
index be7edc8..345a1af 100644
--- a/sys/netatm/atm_stack.h
+++ b/sys/netatm/atm_stack.h
@@ -38,7 +38,7 @@
#ifndef _NETATM_ATM_STACK_H
#define _NETATM_ATM_STACK_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure used to define a kernel-provided ATM stack service and its
* associated entry points. Each stack service provider must register
@@ -282,6 +282,6 @@ struct stackq_entry {
if (atm_stackq_head) \
atm_stack_drain(); \
}
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_STACK_H */
diff --git a/sys/netatm/atm_sys.h b/sys/netatm/atm_sys.h
index 0c240bf..0c71bec 100644
--- a/sys/netatm/atm_sys.h
+++ b/sys/netatm/atm_sys.h
@@ -151,7 +151,7 @@ typedef u_char Encaps_t;
#define ATM_ENC_LLC 2 /* LLC encapsulation */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* ATM timer control block. Used to schedule a timeout via atm_timeout().
* This control block will typically be embedded in a processing-specific
@@ -270,6 +270,6 @@ struct sp_link {
#define ATM_DEBUGN5(f,a1,a2,a3,a4,a5)
#endif
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_SYS_H */
diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h
index d19a475..66edeb5 100644
--- a/sys/netatm/atm_var.h
+++ b/sys/netatm/atm_var.h
@@ -39,7 +39,7 @@
#define _NETATM_ATM_VAR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Global variable declarations
*/
@@ -203,6 +203,6 @@ int atm_dgram_usrreq __P((struct socket *, int, KBuffer *,
KBuffer *, KBuffer *));
#endif
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _NETATM_ATM_VAR_H */
diff --git a/sys/netatm/atm_vc.h b/sys/netatm/atm_vc.h
index 64d1b6f..8ee4253 100644
--- a/sys/netatm/atm_vc.h
+++ b/sys/netatm/atm_vc.h
@@ -39,7 +39,7 @@
#define _NETATM_ATM_VC_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* ATM Virtual Channel Connection control block. All vccb's are created
* and controlled by an ATM signalling manager. Each ATM signalling
@@ -66,7 +66,7 @@ struct vccb {
long vc_oerrors; /* Errors sending to VCC */
time_t vc_tstamp; /* State transition timestamp */
};
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* VCC Types
diff --git a/sys/netatm/ipatm/ipatm_var.h b/sys/netatm/ipatm/ipatm_var.h
index b587a6e..fc5be44 100644
--- a/sys/netatm/ipatm/ipatm_var.h
+++ b/sys/netatm/ipatm/ipatm_var.h
@@ -38,7 +38,7 @@
#ifndef _IPATM_IPATM_VAR_H
#define _IPATM_IPATM_VAR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure containing information for each VCC, both SVC and PVC, which
* supports IP traffic.
@@ -60,7 +60,7 @@ struct ipvcc {
};
#define iv_forw iv_elem.q_forw
#define iv_back iv_elem.q_back
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* VCC Flags
@@ -83,7 +83,7 @@ struct ipvcc {
#define IPVCC_CLOSED 6 /* VCC has been closed */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure containing IP-specific information for each ATM network
* interface in the system.
@@ -210,6 +210,6 @@ extern Atm_attributes ipatm_aal5llc;
extern Atm_attributes ipatm_aal5null;
extern Atm_attributes ipatm_aal4null;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _IPATM_IPATM_VAR_H */
diff --git a/sys/netatm/kern_include.h b/sys/netatm/kern_include.h
index 5854741..3817c2c 100644
--- a/sys/netatm/kern_include.h
+++ b/sys/netatm/kern_include.h
@@ -38,11 +38,6 @@
#ifndef _NETATM_KERN_INCLUDE_H
#define _NETATM_KERN_INCLUDE_H
-/*
- * Note that we're compiling kernel code
- */
-#define ATM_KERNEL
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index d9a0b13..ca111c7 100644
--- a/sys/netatm/port.h
+++ b/sys/netatm/port.h
@@ -72,7 +72,7 @@
* Zeros len bytes of data from addr.
*
*/
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
#if (defined(BSD) && (BSD >= 199103))
#include <sys/malloc.h>
#define KM_ALLOC(size, type, flags) malloc((size), (type), (flags))
@@ -119,10 +119,10 @@
#endif
#define XM_COPY(f, t, l) UM_COPY((f), (t), (l))
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Kernel buffers
*
@@ -526,7 +526,7 @@ typedef int KTimeout_ret;
#define KT_TIME(t) ((t) = time)
#endif
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#ifndef NTOHL
#if BYTE_ORDER == BIG_ENDIAN
diff --git a/sys/netatm/sigpvc/sigpvc_var.h b/sys/netatm/sigpvc/sigpvc_var.h
index 2cb96bc..3488a0f 100644
--- a/sys/netatm/sigpvc/sigpvc_var.h
+++ b/sys/netatm/sigpvc/sigpvc_var.h
@@ -38,7 +38,7 @@
#ifndef _SIGPVC_SIGPVC_VAR_H
#define _SIGPVC_SIGPVC_VAR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure containing state information for each SigPVC protocol instance.
* There will be one instance for each ATM device interface using the SigPVC
@@ -52,7 +52,7 @@ struct sigpvc {
#define pv_addr pv_inst.si_addr
#define pv_vccq pv_inst.si_vccq
#define pv_state pv_inst.si_state
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* SigPVC Protocol States
@@ -61,7 +61,7 @@ struct sigpvc {
#define SIGPVC_DETACH 2 /* Detach in progress */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* SigPVC Virtual Channel Connection control block. All information regarding
* the state of a SigPVC controlled VCC will be recorded here. There will be
@@ -70,7 +70,7 @@ struct sigpvc {
struct sigpvc_vccb {
struct vccb vcp_hdr; /* Generic vccb */
};
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* SigPVC VCC Signalling Protocol States
@@ -80,7 +80,7 @@ struct sigpvc_vccb {
#define VCCS_FREE 2 /* Waiting for user to free resources */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Global function declarations
*/
@@ -90,6 +90,6 @@ struct sigpvc_vccb {
int sigpvc_create_pvc __P((struct sigpvc *, Atm_connvc *, int *));
void sigpvc_close_vcc __P((struct vccb *));
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _SIGPVC_SIGPVC_VAR_H */
diff --git a/sys/netatm/spans/spans_cls.h b/sys/netatm/spans/spans_cls.h
index 02e2f6a..3c7a7ff 100644
--- a/sys/netatm/spans/spans_cls.h
+++ b/sys/netatm/spans/spans_cls.h
@@ -147,7 +147,7 @@ struct spansarp_hdr {
#define ARP_PACKET_LEN \
(sizeof(struct spanscls_hdr) + sizeof(struct spansarp_hdr))
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Macros for manipulating SPANS ARP tables and entries
*/
@@ -183,6 +183,6 @@ struct spansarp_hdr {
extern struct spanscls *spanscls_head;
extern struct spanscls_hdr spanscls_hdr;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _SPANS_SPANSCLS_H */
diff --git a/sys/netatm/spans/spans_var.h b/sys/netatm/spans/spans_var.h
index f93d1fc..3f0dbb3 100644
--- a/sys/netatm/spans/spans_var.h
+++ b/sys/netatm/spans/spans_var.h
@@ -38,7 +38,7 @@
#ifndef _SPANS_SPANS_VAR_H
#define _SPANS_SPANS_VAR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Constants to indicate the state of the signalling interface
*/
@@ -74,7 +74,7 @@ struct spans {
#define sp_vccq sp_inst.si_vccq
#define sp_state sp_inst.si_state
#define sp_ipserv sp_inst.si_ipserv
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* SPANS Protocol States
@@ -89,7 +89,7 @@ struct spans {
#define SPANS_PROBE_ERR_WAIT (3 * ATM_HZ) /* Time to wait if send probe fails */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* SPANS Virtual Channel Connection control block. All information
* regarding the state of a SPANS-controlled VCC will be recorded here.
@@ -130,7 +130,7 @@ struct spans_vccb {
#define SV_MAX_RETRY 3
#define SV_TIMEOUT (ATM_HZ)
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
@@ -147,7 +147,7 @@ struct spans_vccb {
#define SPANS_VC_FREE 8 /* Waiting for user to free resources */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Macro to compare two SPANS addresses.
*
@@ -254,6 +254,6 @@ extern struct sp_info spans_vcpool;
extern struct sp_info spans_msgpool;
extern struct t_atm_cause spans_cause;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _SPANS_SPANS_VAR_H */
diff --git a/sys/netatm/uni/sscf_uni_var.h b/sys/netatm/uni/sscf_uni_var.h
index f8b70aa..4f4cea7 100644
--- a/sys/netatm/uni/sscf_uni_var.h
+++ b/sys/netatm/uni/sscf_uni_var.h
@@ -87,7 +87,7 @@ struct univcc {
#define UVF_NOESTIND 0x0001 /* Don't process ESTABLISH_IND */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Global function declarations
*/
@@ -110,6 +110,6 @@ void sscf_uni_upper __P((int, void *, int, int));
*/
extern int sscf_uni_vccnt;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _UNI_SSCF_UNI_VAR_H */
diff --git a/sys/netatm/uni/sscop_var.h b/sys/netatm/uni/sscop_var.h
index f29108a..b063212 100644
--- a/sys/netatm/uni/sscop_var.h
+++ b/sys/netatm/uni/sscop_var.h
@@ -134,7 +134,7 @@ struct sscop_stat {
u_long sos_maa_error[MAA_ERROR_COUNT]; /* Management errors */
};
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Global function declarations
*/
@@ -278,6 +278,6 @@ extern void (*(*sscop_qsaal_pdutab[]))
extern void (*(*sscop_q2110_pdutab[]))
__P((struct sscop *, KBuffer *, caddr_t));
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _UNI_SSCOP_VAR_H */
diff --git a/sys/netatm/uni/uniip_var.h b/sys/netatm/uni/uniip_var.h
index 409d2ad..343fd78 100644
--- a/sys/netatm/uni/uniip_var.h
+++ b/sys/netatm/uni/uniip_var.h
@@ -38,7 +38,7 @@
#ifndef _UNI_UNIIP_VAR_H
#define _UNI_UNIIP_VAR_H
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* UNI IP network interface structure. There will be one such structure for
* each IP network interface attached via a UNI signalling instance.
@@ -59,7 +59,7 @@ struct uniip {
#define uip_arpsvrip uip_arpsvrmap.am_dstip
#define uip_arpsvratm uip_arpsvrmap.am_dstatm
#define uip_arpsvrsub uip_arpsvrmap.am_dstatmsub
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* UNI Interface Flags
@@ -77,7 +77,7 @@ struct uniip {
#define UIAS_CLIENT_ACTIVE 6 /* Client - active */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure for allowable IP prefixes for ATMARP server registration
*/
@@ -126,7 +126,7 @@ struct uniarp {
#define ua_dstip ua_arpmap.am_dstip
#define ua_dstatm ua_arpmap.am_dstatm
#define ua_dstatmsub ua_arpmap.am_dstatmsub
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* UNIARP Entry Flags
@@ -197,7 +197,7 @@ struct atmarp_hdr {
#define ARP_TL_LMASK 0x3f /* Length mask */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Timer macros
*/
@@ -313,6 +313,6 @@ int uniip_start __P((void));
int uniip_stop __P((void));
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _UNI_UNIIP_VAR_H */
diff --git a/sys/netatm/uni/unisig_var.h b/sys/netatm/uni/unisig_var.h
index ca7e7fa..92e8362 100644
--- a/sys/netatm/uni/unisig_var.h
+++ b/sys/netatm/uni/unisig_var.h
@@ -43,7 +43,7 @@
#define FALSE 0
#endif
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* Structure containing state information for each UNI protocol
* instance. There will be one instance for each ATM device interface
@@ -68,7 +68,7 @@ struct unisig {
#define us_vccq us_inst.si_vccq
#define us_state us_inst.si_state
#define us_ipserv us_inst.si_ipserv
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* Signalling manager states
@@ -99,7 +99,7 @@ struct unisig {
#define UNISIG_SSCF_TIMEOUT (3 * ATM_HZ)
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* UNI Virtual Channel Connection control block. All information
* regarding the state of a UNI-controlled VCC will be recorded here.
@@ -130,7 +130,7 @@ struct unisig_vccb {
#define uv_ierrors vcp_hdr.vc_ierrors
#define uv_oerrors vcp_hdr.vc_oerrors
#define uv_tstamp vcp_hdr.vc_tstamp
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
/*
* UNI VCC protocol states. Taken from The ATM Forum UNI 3.0 (section
@@ -182,7 +182,7 @@ struct unisig_vccb {
#define UNI_VC_SAAL_ESTAB 20 /* Signalling AAL back up */
-#ifdef ATM_KERNEL
+#ifdef _KERNEL
/*
* UNI Timer Values. These values (except for T317) are taken from
* The ATM Forum UNI 3.0 (section 5.7.2).
@@ -318,6 +318,6 @@ extern struct sp_info unisig_vcpool;
extern struct sp_info unisig_msgpool;
extern struct sp_info unisig_iepool;
-#endif /* ATM_KERNEL */
+#endif /* _KERNEL */
#endif /* _UNISIG_VAR_H */
OpenPOWER on IntegriCloud