diff options
| -rw-r--r-- | device/blkio.c | 2 | ||||
| -rw-r--r-- | device/blkio.h | 2 | ||||
| -rw-r--r-- | device/conf.h | 4 | ||||
| -rw-r--r-- | device/dev_name.c | 4 | ||||
| -rw-r--r-- | i386/i386/thread.h | 1 | ||||
| -rw-r--r-- | i386/i386at/kd.c | 2 | ||||
| -rw-r--r-- | i386/i386at/kd.h | 2 | ||||
| -rw-r--r-- | i386/i386at/mem.c | 2 | ||||
| -rw-r--r-- | i386/i386at/mem.h | 2 | ||||
| -rw-r--r-- | i386/i386at/model_dep.c | 2 | ||||
| -rw-r--r-- | i386/i386at/model_dep.h | 2 |
11 files changed, 12 insertions, 13 deletions
diff --git a/device/blkio.c b/device/blkio.c index e5b4d09f..7ec1f2cf 100644 --- a/device/blkio.c +++ b/device/blkio.c @@ -101,7 +101,7 @@ void minphys(io_req_t ior) * Dummy routine placed in device switch entries to indicate that * block device may be mapped. */ -int block_io_mmap(dev_t dev, vm_offset_t off, int prot) +vm_offset_t block_io_mmap(dev_t dev, vm_offset_t off, int prot) { return (0); } diff --git a/device/blkio.h b/device/blkio.h index 77eb105a..aaff9f8a 100644 --- a/device/blkio.h +++ b/device/blkio.h @@ -19,6 +19,6 @@ #ifndef _DEVICE_BLKIO_H_ #define _DEVICE_BLKIO_H_ -extern int block_io_mmap(dev_t dev, vm_offset_t off, int prot); +extern vm_offset_t block_io_mmap(dev_t dev, vm_offset_t off, int prot); #endif /* _DEVICE_BLKIO_H_ */ diff --git a/device/conf.h b/device/conf.h index 14a23f97..1af00285 100644 --- a/device/conf.h +++ b/device/conf.h @@ -53,7 +53,7 @@ struct dev_ops { int (*d_write)(dev_t, io_req_t); /* write */ 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 */ + vm_offset_t (*d_mmap)(dev_t, vm_offset_t, vm_prot_t); /* map memory */ int (*d_async_in)(); /* asynchronous input setup */ int (*d_reset)(); /* reset device */ int (*d_port_death)(dev_t, mach_port_t); @@ -76,7 +76,7 @@ extern io_return_t nulldev_getstat(dev_t dev, dev_flavor_t flavor, dev_status_t 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 */ +extern vm_offset_t nomap(dev_t dev, vm_offset_t off, int prot); /* no operation - error */ /* * Flavor constants for d_dev_info routine diff --git a/device/dev_name.c b/device/dev_name.c index 6036fb46..f6133679 100644 --- a/device/dev_name.c +++ b/device/dev_name.c @@ -83,10 +83,10 @@ int nodev(void) return (D_INVALID_OPERATION); } -int +vm_offset_t nomap(dev_t dev, vm_offset_t off, int prot) { - return (D_INVALID_OPERATION); + return -1; } /* diff --git a/i386/i386/thread.h b/i386/i386/thread.h index 3514de37..bae61e31 100644 --- a/i386/i386/thread.h +++ b/i386/i386/thread.h @@ -40,7 +40,6 @@ #include <kern/lock.h> -//#include <i386/tss.h> #include "gdt.h" /* diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c index f3ada21c..8e9222a0 100644 --- a/i386/i386at/kd.c +++ b/i386/i386at/kd.c @@ -545,7 +545,7 @@ io_req_t uio; */ /*ARGSUSED*/ -int +vm_offset_t kdmmap(dev, off, prot) dev_t dev; vm_offset_t off; diff --git a/i386/i386at/kd.h b/i386/i386at/kd.h index 6008608f..6f425ae9 100644 --- a/i386/i386at/kd.h +++ b/i386/i386at/kd.h @@ -771,7 +771,7 @@ extern io_return_t kdsetstat( 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); +extern vm_offset_t kdmmap(dev_t dev, vm_offset_t off, vm_prot_t prot); boolean_t kdcheckmagic(Scancode scancode); diff --git a/i386/i386at/mem.c b/i386/i386at/mem.c index eac2549f..61143185 100644 --- a/i386/i386at/mem.c +++ b/i386/i386at/mem.c @@ -30,7 +30,7 @@ /* This provides access to any memory that is not main RAM */ /*ARGSUSED*/ -int +vm_offset_t memmmap(dev, off, prot) dev_t dev; vm_offset_t off; diff --git a/i386/i386at/mem.h b/i386/i386at/mem.h index 0bc85ea4..a5b4aefe 100644 --- a/i386/i386at/mem.h +++ b/i386/i386at/mem.h @@ -19,6 +19,6 @@ #ifndef _MEM_H_ #define _MEM_H_ -extern int memmmap(dev_t dev, vm_offset_t off, vm_prot_t prot); +extern vm_offset_t memmmap(dev_t dev, vm_offset_t off, vm_prot_t prot); #endif /* _MEM_H_ */ diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c index feda8c33..08c9238c 100644 --- a/i386/i386at/model_dep.c +++ b/i386/i386at/model_dep.c @@ -643,7 +643,7 @@ void c_boot_entry(vm_offset_t bi) #include <vm/pmap.h> #include <mach/time_value.h> -int +vm_offset_t timemmap(dev, off, prot) dev_t dev; vm_offset_t off; diff --git a/i386/i386at/model_dep.h b/i386/i386at/model_dep.h index 47551b85..d47378a1 100644 --- a/i386/i386at/model_dep.h +++ b/i386/i386at/model_dep.h @@ -30,7 +30,7 @@ extern vm_offset_t int_stack_top, int_stack_base; /* Check whether P points to the interrupt stack. */ #define ON_INT_STACK(P) (((P) & ~(KERNEL_STACK_SIZE-1)) == int_stack_base) -extern int timemmap(dev_t dev, vm_offset_t off, vm_prot_t prot); +extern vm_offset_t timemmap(dev_t dev, vm_offset_t off, vm_prot_t prot); void inittodr(void); |