summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/amd64/include/apicreg.h7
-rw-r--r--sys/amd64/include/smp.h6
-rw-r--r--sys/i386/include/apic.h7
-rw-r--r--sys/i386/include/apicreg.h7
-rw-r--r--sys/i386/include/smp.h6
-rw-r--r--sys/sys/smp.h6
6 files changed, 27 insertions, 12 deletions
diff --git a/sys/amd64/include/apicreg.h b/sys/amd64/include/apicreg.h
index afa1c51..c70a9ed 100644
--- a/sys/amd64/include/apicreg.h
+++ b/sys/amd64/include/apicreg.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: apic.h,v 1.4 1997/06/22 16:03:46 peter Exp $
+ * $Id: apic.h,v 1.2 1997/07/08 23:29:48 smp Exp smp $
*/
#ifndef _MACHINE_APIC_H_
@@ -229,12 +229,17 @@ typedef struct IOAPIC ioapic_t;
#define MAXLVTSHIFT 16
/* fields in SVR */
+#define APIC_SVR_VECTOR 0x000000ff
+#define APIC_SVR_VEC_PROG 0x000000f0
+#define APIC_SVR_VEC_FIX 0x0000000f
#define APIC_SVR_ENABLE 0x00000100
# define APIC_SVR_SWDIS 0x00000000
# define APIC_SVR_SWEN 0x00000100
#define APIC_SVR_FOCUS 0x00000200
# define APIC_SVR_FEN 0x00000000
# define APIC_SVR_FDIS 0x00000200
+
+/* fields in TPR */
#define APIC_TPR_PRIO 0x000000ff
# define APIC_TPR_INT 0x000000f0
# define APIC_TPR_SUB 0x0000000f
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index a6d164c..c328e59 100644
--- a/sys/amd64/include/smp.h
+++ b/sys/amd64/include/smp.h
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: smp.h,v 1.5 1997/07/06 23:36:49 smp Exp smp $
+ * $Id: smp.h,v 1.6 1997/07/08 23:29:48 smp Exp smp $
*
*/
@@ -94,7 +94,7 @@ int apic_src_bus_irq __P((int, int));
int apic_int_type __P((int, int));
int apic_trigger __P((int, int));
int apic_polarity __P((int, int));
-void configure_local_apic __P((void));
+void bsp_apic_configure __P((void));
void init_secondary __P((void));
void smp_invltlb __P((void));
int stop_cpus __P((u_int));
@@ -110,7 +110,7 @@ extern volatile ioapic_t *ioapic[];
#endif /* MULTIPLE_IOAPICS */
/* functions in mpapic.c */
-void apic_initialize __P((int));
+void apic_initialize __P((void));
int apic_ipi __P((int, int, int));
int selected_apic_ipi __P((u_int, int, int));
int io_apic_setup __P((int));
diff --git a/sys/i386/include/apic.h b/sys/i386/include/apic.h
index afa1c51..c70a9ed 100644
--- a/sys/i386/include/apic.h
+++ b/sys/i386/include/apic.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: apic.h,v 1.4 1997/06/22 16:03:46 peter Exp $
+ * $Id: apic.h,v 1.2 1997/07/08 23:29:48 smp Exp smp $
*/
#ifndef _MACHINE_APIC_H_
@@ -229,12 +229,17 @@ typedef struct IOAPIC ioapic_t;
#define MAXLVTSHIFT 16
/* fields in SVR */
+#define APIC_SVR_VECTOR 0x000000ff
+#define APIC_SVR_VEC_PROG 0x000000f0
+#define APIC_SVR_VEC_FIX 0x0000000f
#define APIC_SVR_ENABLE 0x00000100
# define APIC_SVR_SWDIS 0x00000000
# define APIC_SVR_SWEN 0x00000100
#define APIC_SVR_FOCUS 0x00000200
# define APIC_SVR_FEN 0x00000000
# define APIC_SVR_FDIS 0x00000200
+
+/* fields in TPR */
#define APIC_TPR_PRIO 0x000000ff
# define APIC_TPR_INT 0x000000f0
# define APIC_TPR_SUB 0x0000000f
diff --git a/sys/i386/include/apicreg.h b/sys/i386/include/apicreg.h
index afa1c51..c70a9ed 100644
--- a/sys/i386/include/apicreg.h
+++ b/sys/i386/include/apicreg.h
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: apic.h,v 1.4 1997/06/22 16:03:46 peter Exp $
+ * $Id: apic.h,v 1.2 1997/07/08 23:29:48 smp Exp smp $
*/
#ifndef _MACHINE_APIC_H_
@@ -229,12 +229,17 @@ typedef struct IOAPIC ioapic_t;
#define MAXLVTSHIFT 16
/* fields in SVR */
+#define APIC_SVR_VECTOR 0x000000ff
+#define APIC_SVR_VEC_PROG 0x000000f0
+#define APIC_SVR_VEC_FIX 0x0000000f
#define APIC_SVR_ENABLE 0x00000100
# define APIC_SVR_SWDIS 0x00000000
# define APIC_SVR_SWEN 0x00000100
#define APIC_SVR_FOCUS 0x00000200
# define APIC_SVR_FEN 0x00000000
# define APIC_SVR_FDIS 0x00000200
+
+/* fields in TPR */
#define APIC_TPR_PRIO 0x000000ff
# define APIC_TPR_INT 0x000000f0
# define APIC_TPR_SUB 0x0000000f
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index a6d164c..c328e59 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: smp.h,v 1.5 1997/07/06 23:36:49 smp Exp smp $
+ * $Id: smp.h,v 1.6 1997/07/08 23:29:48 smp Exp smp $
*
*/
@@ -94,7 +94,7 @@ int apic_src_bus_irq __P((int, int));
int apic_int_type __P((int, int));
int apic_trigger __P((int, int));
int apic_polarity __P((int, int));
-void configure_local_apic __P((void));
+void bsp_apic_configure __P((void));
void init_secondary __P((void));
void smp_invltlb __P((void));
int stop_cpus __P((u_int));
@@ -110,7 +110,7 @@ extern volatile ioapic_t *ioapic[];
#endif /* MULTIPLE_IOAPICS */
/* functions in mpapic.c */
-void apic_initialize __P((int));
+void apic_initialize __P((void));
int apic_ipi __P((int, int, int));
int selected_apic_ipi __P((u_int, int, int));
int io_apic_setup __P((int));
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index a6d164c..c328e59 100644
--- a/sys/sys/smp.h
+++ b/sys/sys/smp.h
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: smp.h,v 1.5 1997/07/06 23:36:49 smp Exp smp $
+ * $Id: smp.h,v 1.6 1997/07/08 23:29:48 smp Exp smp $
*
*/
@@ -94,7 +94,7 @@ int apic_src_bus_irq __P((int, int));
int apic_int_type __P((int, int));
int apic_trigger __P((int, int));
int apic_polarity __P((int, int));
-void configure_local_apic __P((void));
+void bsp_apic_configure __P((void));
void init_secondary __P((void));
void smp_invltlb __P((void));
int stop_cpus __P((u_int));
@@ -110,7 +110,7 @@ extern volatile ioapic_t *ioapic[];
#endif /* MULTIPLE_IOAPICS */
/* functions in mpapic.c */
-void apic_initialize __P((int));
+void apic_initialize __P((void));
int apic_ipi __P((int, int, int));
int selected_apic_ipi __P((u_int, int, int));
int io_apic_setup __P((int));
OpenPOWER on IntegriCloud