[BACK]Return to intr.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / arch / x86 / include

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/arch/x86/include/intr.h between version 1.31 and 1.31.8.2

version 1.31, 2008/01/21 02:56:14 version 1.31.8.2, 2008/06/04 02:04:58
Line 1 
Line 1 
 /*      $NetBSD$        */  /*      $NetBSD$        */
   
 /*-  /*-
  * Copyright (c) 1998, 2001, 2006, 2007 The NetBSD Foundation, Inc.   * Copyright (c) 1998, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.   * All rights reserved.
  *   *
  * This code is derived from software contributed to The NetBSD Foundation   * This code is derived from software contributed to The NetBSD Foundation
Line 15 
Line 15 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software  
  *    must display the following acknowledgement:  
  *        This product includes software developed by the NetBSD  
  *        Foundation, Inc. and its contributors.  
  * 4. Neither the name of The NetBSD Foundation nor the names of its  
  *    contributors may be used to endorse or promote products derived  
  *    from this software without specific prior written permission.  
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS   * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED   * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Line 40 
Line 33 
 #define _X86_INTR_H_  #define _X86_INTR_H_
   
 #define __HAVE_FAST_SOFTINTS  #define __HAVE_FAST_SOFTINTS
   #define __HAVE_PREEMPTION
   
 #include <machine/intrdefs.h>  #include <machine/intrdefs.h>
   
Line 155  splraiseipl(ipl_cookie_t icookie)
Line 149  splraiseipl(ipl_cookie_t icookie)
  */   */
   
 void Xsoftintr(void);  void Xsoftintr(void);
   void Xpreemptrecurse(void);
   void Xpreemptresume(void);
   
 extern struct intrstub i8259_stubs[];  extern struct intrstub i8259_stubs[];
 extern struct intrstub ioapic_edge_stubs[];  extern struct intrstub ioapic_edge_stubs[];
Line 169  void *nmi_establish(int (*)(void *), voi
Line 165  void *nmi_establish(int (*)(void *), voi
 bool nmi_disestablish(void *);  bool nmi_disestablish(void *);
 int nmi_dispatch(void);  int nmi_dispatch(void);
 int x86_nmi(void);  int x86_nmi(void);
 void intr_calculatemasks(struct cpu_info *);  void *intr_establish(int, struct pic *, int, int, int, int (*)(void *), void *, bool);
 int intr_allocate_slot_cpu(struct cpu_info *, struct pic *, int, int *);  
 int intr_allocate_slot(struct pic *, int, int, int, struct cpu_info **, int *,  
                        int *);  
 void *intr_establish(int, struct pic *, int, int, int, int (*)(void *), void *);  
 void intr_disestablish(struct intrhand *);  void intr_disestablish(struct intrhand *);
 void intr_add_pcibus(struct pcibus_attach_args *);  void intr_add_pcibus(struct pcibus_attach_args *);
 const char *intr_string(int);  const char *intr_string(int);
Legend:
Removed from v.1.31  
changed lines
  Added in v.1.31.8.2
CVSweb <webmaster@jp.NetBSD.org>