aboutsummaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
Diffstat (limited to 'i386')
-rw-r--r--i386/i386/pcb.h1
-rw-r--r--i386/i386/thread.h2
-rw-r--r--i386/i386at/com.c12
-rw-r--r--i386/i386at/com.h12
-rw-r--r--i386/i386at/kd.c12
-rw-r--r--i386/i386at/kd.h12
-rw-r--r--i386/i386at/kd_event.c12
-rw-r--r--i386/i386at/kd_event.h12
-rw-r--r--i386/i386at/kd_mouse.c6
-rw-r--r--i386/i386at/kd_mouse.h6
-rw-r--r--i386/i386at/lpr.c12
-rw-r--r--i386/i386at/lpr.h12
12 files changed, 56 insertions, 55 deletions
diff --git a/i386/i386/pcb.h b/i386/i386/pcb.h
index cf476942..30d96271 100644
--- a/i386/i386/pcb.h
+++ b/i386/i386/pcb.h
@@ -30,6 +30,7 @@
#include <mach/exec/exec.h>
#include <mach/thread_status.h>
#include <machine/thread.h>
+#include <machine/io_perm.h>
extern void pcb_init (task_t parent_task, thread_t thread);
diff --git a/i386/i386/thread.h b/i386/i386/thread.h
index 9bda11f5..3514de37 100644
--- a/i386/i386/thread.h
+++ b/i386/i386/thread.h
@@ -40,7 +40,7 @@
#include <kern/lock.h>
-#include <i386/tss.h>
+//#include <i386/tss.h>
#include "gdt.h"
/*
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index 84891bd2..4689e30d 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -443,9 +443,9 @@ mach_port_t port;
io_return_t
comgetstat(dev, flavor, data, count)
dev_t dev;
-int flavor;
-int *data; /* pointer to OUT array */
-natural_t *count; /* out */
+dev_flavor_t flavor;
+dev_status_t data; /* pointer to OUT array */
+mach_msg_type_number_t *count; /* out */
{
io_return_t result = D_SUCCESS;
int unit = minor(dev);
@@ -466,9 +466,9 @@ natural_t *count; /* out */
io_return_t
comsetstat(
dev_t dev,
- int flavor,
- int * data,
- natural_t count)
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t count)
{
io_return_t result = D_SUCCESS;
int unit = minor(dev);
diff --git a/i386/i386at/com.h b/i386/i386at/com.h
index 779cdba8..a415488c 100644
--- a/i386/i386at/com.h
+++ b/i386/i386at/com.h
@@ -60,16 +60,16 @@ void comattach(struct bus_device *dev);
extern io_return_t
comgetstat(
dev_t dev,
- int flavor,
- int *data,
- natural_t *count);
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t *count);
extern io_return_t
comsetstat(
dev_t dev,
- int flavor,
- int *data,
- natural_t count);
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t count);
#if MACH_KDB
extern void kdb_kintr(void);
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 9ed3958a..f3ada21c 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -569,9 +569,9 @@ kdportdeath(
/*ARGSUSED*/
io_return_t kdgetstat(
dev_t dev,
- int flavor,
- int * data, /* pointer to OUT array */
- natural_t *count) /* OUT */
+ dev_flavor_t flavor,
+ dev_status_t data, /* pointer to OUT array */
+ mach_msg_type_number_t *count) /* OUT */
{
io_return_t result;
@@ -599,9 +599,9 @@ io_return_t kdgetstat(
/*ARGSUSED*/
io_return_t kdsetstat(
dev_t dev,
- int flavor,
- int * data,
- natural_t count)
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t count)
{
io_return_t result;
diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h
index 60cee7e3..6008608f 100644
--- a/i386/i386at/kd.h
+++ b/i386/i386at/kd.h
@@ -760,15 +760,15 @@ extern int kdwrite(dev_t dev, io_req_t uio);
extern io_return_t kdgetstat(
dev_t dev,
- int flavor,
- int *data,
- natural_t *count);
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t *count);
extern io_return_t kdsetstat(
dev_t dev,
- int flavor,
- int * data,
- natural_t count);
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t count);
extern int kdportdeath(dev_t dev, mach_port_t port);
extern int kdmmap(dev_t dev, vm_offset_t off, vm_prot_t prot);
diff --git a/i386/i386at/kd_event.c b/i386/i386at/kd_event.c
index 694c165e..bed9240f 100644
--- a/i386/i386at/kd_event.c
+++ b/i386/i386at/kd_event.c
@@ -145,9 +145,9 @@ kbdclose(
io_return_t kbdgetstat(
dev_t dev,
- int flavor,
- int * data, /* pointer to OUT array */
- unsigned int *count) /* OUT */
+ dev_flavor_t flavor,
+ dev_status_t data, /* pointer to OUT array */
+ mach_msg_type_number_t *count) /* OUT */
{
switch (flavor) {
case KDGKBDTYPE:
@@ -167,9 +167,9 @@ io_return_t kbdgetstat(
io_return_t kbdsetstat(
dev_t dev,
- int flavor,
- int * data,
- unsigned int count)
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t count)
{
switch (flavor) {
case KDSKBDMODE:
diff --git a/i386/i386at/kd_event.h b/i386/i386at/kd_event.h
index 8b2d6642..7e66f762 100644
--- a/i386/i386at/kd_event.h
+++ b/i386/i386at/kd_event.h
@@ -40,15 +40,15 @@ extern int kbdread(dev_t dev, io_req_t ior);
extern io_return_t kbdgetstat(
dev_t dev,
- int flavor,
- int *data,
- unsigned int *count);
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t *count);
extern io_return_t kbdsetstat(
dev_t dev,
- int flavor,
- int *data,
- unsigned int count);
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t count);
extern void kd_enqsc(Scancode sc);
diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c
index ece13efe..20a8c88c 100644
--- a/i386/i386at/kd_mouse.c
+++ b/i386/i386at/kd_mouse.c
@@ -297,9 +297,9 @@ kd_mouse_close(
io_return_t mousegetstat(
dev_t dev,
- int flavor,
- int * data, /* pointer to OUT array */
- unsigned int *count) /* OUT */
+ dev_flavor_t flavor,
+ dev_status_t data, /* pointer to OUT array */
+ mach_msg_type_number_t *count) /* OUT */
{
switch (flavor) {
case DEV_GET_SIZE:
diff --git a/i386/i386at/kd_mouse.h b/i386/i386at/kd_mouse.h
index a8a72a3b..2d813c4a 100644
--- a/i386/i386at/kd_mouse.h
+++ b/i386/i386at/kd_mouse.h
@@ -60,9 +60,9 @@ extern int mouseread(dev_t dev, io_req_t ior);
extern io_return_t mousegetstat(
dev_t dev,
- int flavor,
- int *data,
- unsigned int *count);
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t *count);
void mouseintr(int unit);
boolean_t mouse_read_done(io_req_t ior);
diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c
index 0b018c79..49cb1387 100644
--- a/i386/i386at/lpr.c
+++ b/i386/i386at/lpr.c
@@ -178,9 +178,9 @@ mach_port_t port;
io_return_t
lprgetstat(dev, flavor, data, count)
dev_t dev;
-int flavor;
-int *data; /* pointer to OUT array */
-natural_t *count; /* out */
+dev_flavor_t flavor;
+dev_status_t data; /* pointer to OUT array */
+mach_msg_type_number_t *count; /* out */
{
io_return_t result = D_SUCCESS;
int unit = minor(dev);
@@ -196,9 +196,9 @@ natural_t *count; /* out */
io_return_t
lprsetstat(
dev_t dev,
- int flavor,
- int * data,
- natural_t count)
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t count)
{
io_return_t result = D_SUCCESS;
int unit = minor(dev);
diff --git a/i386/i386at/lpr.h b/i386/i386at/lpr.h
index 269fd643..cab30166 100644
--- a/i386/i386at/lpr.h
+++ b/i386/i386at/lpr.h
@@ -44,16 +44,16 @@ void lprattach(struct bus_device *dev);
extern io_return_t
lprgetstat(
dev_t dev,
- int flavor,
- int *data,
- natural_t *count);
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t *count);
extern io_return_t
lprsetstat(
dev_t dev,
- int flavor,
- int *data,
- natural_t count);
+ dev_flavor_t flavor,
+ dev_status_t data,
+ mach_msg_type_number_t count);
void lprpr_addr(unsigned short addr);
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-14 19:46:54 +0000