aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--device/conf.h9
-rw-r--r--device/dev_hdr.h2
-rw-r--r--device/dev_name.c4
-rw-r--r--device/dev_pager.c1
-rw-r--r--device/kmsg.c2
-rw-r--r--device/kmsg.h4
-rw-r--r--device/net_io.c2
-rw-r--r--device/net_io.h2
-rw-r--r--device/tty.h4
-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
-rw-r--r--xen/console.c4
-rw-r--r--xen/console.h4
23 files changed, 76 insertions, 73 deletions
diff --git a/device/conf.h b/device/conf.h
index fea18223..14a23f97 100644
--- a/device/conf.h
+++ b/device/conf.h
@@ -35,6 +35,7 @@
#include <sys/types.h>
#include <mach/port.h>
#include <mach/vm_prot.h>
+#include <device/device_types.h>
struct io_req;
typedef struct io_req *io_req_t;
@@ -50,8 +51,8 @@ struct dev_ops {
void (*d_close)(dev_t, int); /* close device */
int (*d_read)(dev_t, io_req_t); /* read */
int (*d_write)(dev_t, io_req_t); /* write */
- int (*d_getstat)(dev_t, int, int *, natural_t *); /* get status/control */
- int (*d_setstat)(dev_t, int, int *, natural_t); /* set status/control */
+ int (*d_getstat)(dev_t, dev_flavor_t, dev_status_t, mach_msg_type_number_t *); /* get status/control */
+ int (*d_setstat)(dev_t, dev_flavor_t, dev_status_t, mach_msg_type_number_t); /* set status/control */
int (*d_mmap)(dev_t, vm_offset_t, vm_prot_t); /* map memory */
int (*d_async_in)(); /* asynchronous input setup */
int (*d_reset)(); /* reset device */
@@ -71,8 +72,8 @@ extern int nulldev_open(dev_t dev, int flag, io_req_t ior);
extern void nulldev_close(dev_t dev, int flags);
extern int nulldev_read(dev_t dev, io_req_t ior);
extern int nulldev_write(dev_t dev, io_req_t ior);
-extern io_return_t nulldev_getstat(dev_t dev, int flavor, int *data, natural_t *count);
-extern io_return_t nulldev_setstat(dev_t dev, int flavor, int *data, natural_t count);
+extern io_return_t nulldev_getstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t *count);
+extern io_return_t nulldev_setstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t count);
extern io_return_t nulldev_portdeath(dev_t dev, mach_port_t port);
extern int nodev(void); /* no operation - error */
extern int nomap(dev_t dev, vm_offset_t off, int prot); /* no operation - error */
diff --git a/device/dev_hdr.h b/device/dev_hdr.h
index ff7d2ef5..ad98e0bb 100644
--- a/device/dev_hdr.h
+++ b/device/dev_hdr.h
@@ -61,7 +61,7 @@
#include <kern/lock.h>
#include <kern/queue.h>
-#include <device/conf.h>
+typedef struct dev_ops *dev_ops_t;
/* This structure is associated with each open device port.
The port representing the device points to this structure. */
diff --git a/device/dev_name.c b/device/dev_name.c
index 175e3890..6036fb46 100644
--- a/device/dev_name.c
+++ b/device/dev_name.c
@@ -63,12 +63,12 @@ int nulldev_write(dev_t dev, io_req_t ior)
return (D_SUCCESS);
}
-io_return_t nulldev_getstat(dev_t dev, int flavor, int *data, natural_t *count)
+io_return_t nulldev_getstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t *count)
{
return (D_SUCCESS);
}
-io_return_t nulldev_setstat(dev_t dev, int flavor, int *data, natural_t count)
+io_return_t nulldev_setstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t count)
{
return (D_SUCCESS);
}
diff --git a/device/dev_pager.c b/device/dev_pager.c
index 7130229b..0680b5aa 100644
--- a/device/dev_pager.c
+++ b/device/dev_pager.c
@@ -57,6 +57,7 @@
#include <device/memory_object_reply.user.h>
#include <device/dev_pager.h>
#include <device/blkio.h>
+#include <device/conf.h>
/*
* The device pager routines are called directly from the message
diff --git a/device/kmsg.c b/device/kmsg.c
index c80775d9..e49eb3d3 100644
--- a/device/kmsg.c
+++ b/device/kmsg.c
@@ -195,7 +195,7 @@ kmsg_read_done (io_req_t ior)
}
io_return_t
-kmsggetstat (dev_t dev, int flavor, int *data, unsigned int *count)
+kmsggetstat (dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t *count)
{
switch (flavor)
{
diff --git a/device/kmsg.h b/device/kmsg.h
index 8d907f1b..00a35050 100644
--- a/device/kmsg.h
+++ b/device/kmsg.h
@@ -10,8 +10,8 @@
io_return_t kmsgopen (dev_t dev, int flag, io_req_t ior);
void kmsgclose (dev_t dev, int flag);
io_return_t kmsgread (dev_t dev, io_req_t ior);
-io_return_t kmsggetstat (dev_t dev, int flavor,
- int *data, unsigned int *count);
+io_return_t kmsggetstat (dev_t dev, dev_flavor_t flavor,
+ dev_status_t data, mach_msg_type_number_t *count);
void kmsg_putchar (int c);
diff --git a/device/net_io.c b/device/net_io.c
index 99af0b29..72b040a0 100644
--- a/device/net_io.c
+++ b/device/net_io.c
@@ -1374,7 +1374,7 @@ net_getstat(
struct ifnet *ifp,
dev_flavor_t flavor,
dev_status_t status, /* pointer to OUT array */
- natural_t *count) /* OUT */
+ mach_msg_type_number_t *count) /* OUT */
{
switch (flavor) {
case NET_STATUS:
diff --git a/device/net_io.h b/device/net_io.h
index d4e24d41..5baf0678 100644
--- a/device/net_io.h
+++ b/device/net_io.h
@@ -78,7 +78,7 @@ extern void net_ast(void);
extern void net_packet(struct ifnet *, ipc_kmsg_t, unsigned int, boolean_t);
extern void net_filter(ipc_kmsg_t, ipc_kmsg_queue_t);
extern io_return_t net_getstat(struct ifnet *, dev_flavor_t, dev_status_t,
- natural_t *);
+ mach_msg_type_number_t *);
extern io_return_t net_write(struct ifnet *, int (*)(), io_req_t);
/*
diff --git a/device/tty.h b/device/tty.h
index d7aa2add..ea6f4404 100644
--- a/device/tty.h
+++ b/device/tty.h
@@ -72,8 +72,8 @@ struct tty {
* Items beyond this point should be removed to device-specific
* extension structures.
*/
- io_return_t (*t_getstat)(dev_t, int, int *, natural_t *); /* routine to get status */
- io_return_t (*t_setstat)(dev_t, int, int *, natural_t); /* routine to set status */
+ io_return_t (*t_getstat)(dev_t, dev_flavor_t, dev_status_t, mach_msg_type_number_t *); /* routine to get status */
+ io_return_t (*t_setstat)(dev_t, dev_flavor_t, dev_status_t, mach_msg_type_number_t); /* routine to set status */
dev_ops_t t_tops; /* another device to possibly
push through */
};
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);
diff --git a/xen/console.c b/xen/console.c
index aed63cb5..e5aeb186 100644
--- a/xen/console.c
+++ b/xen/console.c
@@ -169,12 +169,12 @@ void hypcnstop()
{
}
-io_return_t hypcngetstat(dev_t dev, int flavor, int *data, unsigned int *count)
+io_return_t hypcngetstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t *count)
{
return tty_get_status(&hypcn_tty, flavor, data, count);
}
-io_return_t hypcnsetstat(dev_t dev, int flavor, int *data, unsigned int count)
+io_return_t hypcnsetstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t count)
{
return tty_set_status(&hypcn_tty, flavor, data, count);
}
diff --git a/xen/console.h b/xen/console.h
index cd5fd5fc..527f5fbd 100644
--- a/xen/console.h
+++ b/xen/console.h
@@ -43,8 +43,8 @@ extern int hypcnopen(dev_t dev, int flag, io_req_t ior);
extern int hypcnread(dev_t dev, io_req_t ior);
extern int hypcnwrite(dev_t dev, io_req_t ior);
extern void hypcnclose(dev_t dev, int flag);
-extern io_return_t hypcngetstat(dev_t dev, int flavor, int *data, unsigned int *count);
-extern io_return_t hypcnsetstat(dev_t dev, int flavor, int *data, unsigned int count);
+extern io_return_t hypcngetstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t *count);
+extern io_return_t hypcnsetstat(dev_t dev, dev_flavor_t flavor, dev_status_t data, mach_msg_type_number_t count);
extern int hypcnportdeath(dev_t dev, mach_port_t port);
#endif /* XEN_CONSOLE_H */
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-08 08:56:57 +0000