summaryrefslogtreecommitdiff
path: root/sys/include/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/include/arch')
-rw-r--r--sys/include/arch/amd64/cpu.h2
-rw-r--r--sys/include/arch/amd64/intr.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/sys/include/arch/amd64/cpu.h b/sys/include/arch/amd64/cpu.h
index 46e5df7..a5f09fb 100644
--- a/sys/include/arch/amd64/cpu.h
+++ b/sys/include/arch/amd64/cpu.h
@@ -45,6 +45,8 @@
struct cpu_info {
uint32_t apicid;
uint32_t feat;
+ uint8_t model : 4; /* CPU model number */
+ uint8_t family : 4; /* CPU family ID */
uint8_t has_x2apic : 1;
uint8_t tlb_shootdown : 1;
uint8_t ipl;
diff --git a/sys/include/arch/amd64/intr.h b/sys/include/arch/amd64/intr.h
index c848b6f..1877d20 100644
--- a/sys/include/arch/amd64/intr.h
+++ b/sys/include/arch/amd64/intr.h
@@ -69,9 +69,11 @@ struct intr_data {
* [r]: Required for intr_register()
* [o]: Not required for intr_register()
* [v]: Returned by intr_register()
+ * [i]: Internal
*
* @func: The actual handler [r]
* @data: Interrupt data [o/v]
+ * @nintr: Number of times it fired [o]
* @name: Interrupt name [v]
* @priority: Interrupt priority [r]
* @irq: Interrupt request number [o]
@@ -91,6 +93,7 @@ struct intr_data {
*/
struct intr_hand {
int(*func)(void *);
+ size_t nintr;
struct intr_data data;
char *name;
int priority;