From 8ab2f5ecc596131f6ca790d6ae35540c06ed7985 Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Sun, 1 Aug 2004 11:40:54 +0000 Subject: Break out the MI part of the /dev/[k]mem and /dev/io drivers into their own directory and module, leaving the MD parts in the MD area (the MD parts _are_ part of the modules). /dev/mem and /dev/io are now loadable modules, thus taking us one step further towards a kernel created entirely out of modules. Of course, there is nothing preventing the kernel from having these statically compiled. --- sys/dev/io/iodev.c | 89 ++++++++++++++++++++++++++++++++++++++++++ sys/dev/mem/memdev.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/null/null.c | 36 ++++++++++++----- 3 files changed, 224 insertions(+), 9 deletions(-) create mode 100644 sys/dev/io/iodev.c create mode 100644 sys/dev/mem/memdev.c (limited to 'sys/dev') diff --git a/sys/dev/io/iodev.c b/sys/dev/io/iodev.c new file mode 100644 index 000000000000..d1b3170d8a5a --- /dev/null +++ b/sys/dev/io/iodev.c @@ -0,0 +1,89 @@ +/*- + * Copyright (c) 2004 Mark R V Murray + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include + +static struct cdev *iodev; + +static struct cdevsw io_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_NEEDGIANT, + .d_open = ioopen, + .d_close = ioclose, + .d_name = "io", +}; + +/* ARGSUSED */ +static int +io_modevent(module_t mod __unused, int type, void *data __unused) +{ + switch(type) { + case MOD_LOAD: + if (bootverbose) + printf("io: \n"); + iodev = make_dev(&io_cdevsw, CDEV_MINOR_IO, + UID_ROOT, GID_WHEEL, 0600, "io"); + break; + + case MOD_UNLOAD: + destroy_dev(iodev); + break; + + case MOD_SHUTDOWN: + break; + + default: + return(EOPNOTSUPP); + break; + + } + + return (0); +} + +DEV_MODULE(io, io_modevent, NULL); diff --git a/sys/dev/mem/memdev.c b/sys/dev/mem/memdev.c new file mode 100644 index 000000000000..290259ab92e0 --- /dev/null +++ b/sys/dev/mem/memdev.c @@ -0,0 +1,108 @@ +/*- + * Copyright (c) 2004 Mark R V Murray + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer + * in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +static struct cdev *memdev, *kmemdev; + +static struct cdevsw mem_cdevsw = { + .d_version = D_VERSION, + .d_flags = D_MEM|D_NEEDGIANT, + .d_open = memopen, + .d_read = memrw, + .d_write = memrw, + .d_ioctl = memioctl, + .d_mmap = memmmap, + .d_name = "mem", +}; + +/* ARGSUSED */ +int +memopen(struct cdev *dev __unused, int flags, int fmt __unused, + struct thread *td) +{ + int error = 0; + + if (flags & FWRITE) + error = securelevel_gt(td->td_ucred, 0); + + return (error); +} + +/* ARGSUSED */ +static int +mem_modevent(module_t mod __unused, int type, void *data __unused) +{ + switch(type) { + case MOD_LOAD: + if (bootverbose) + printf("mem: \n"); + dev_mem_md_init(); /* Machine dependant bit */ + memdev = make_dev(&mem_cdevsw, CDEV_MINOR_MEM, + UID_ROOT, GID_KMEM, 0640, "mem"); + kmemdev = make_dev(&mem_cdevsw, CDEV_MINOR_KMEM, + UID_ROOT, GID_KMEM, 0640, "kmem"); + break; + + case MOD_UNLOAD: + destroy_dev(memdev); + destroy_dev(kmemdev); + break; + + case MOD_SHUTDOWN: + break; + + default: + return(EOPNOTSUPP); + break; + + } + + return (0); +} + +DEV_MODULE(mem, mem_modevent, NULL); diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c index 4f7bd9c8742a..653d732aa8a1 100644 --- a/sys/dev/null/null.c +++ b/sys/dev/null/null.c @@ -43,14 +43,17 @@ __FBSDID("$FreeBSD$"); /* For use with destroy_dev(9). */ static struct cdev *null_dev; static struct cdev *zero_dev; +static struct cdev *full_dev; static d_write_t null_write; static d_ioctl_t null_ioctl; static d_read_t zero_read; +static d_write_t full_write; #define CDEV_MAJOR 2 -#define NULL_MINOR 2 -#define ZERO_MINOR 12 +#define NULL_MINOR 0 +#define ZERO_MINOR 1 +#define FULL_MINOR 2 static struct cdevsw null_cdevsw = { .d_version = D_VERSION, @@ -70,6 +73,14 @@ static struct cdevsw zero_cdevsw = { .d_flags = D_MMAP_ANON, }; +static struct cdevsw full_cdevsw = { + .d_version = D_VERSION, + .d_read = (d_read_t *)nullop, + .d_write = full_write, + .d_name = "full", + .d_maj = CDEV_MAJOR, +}; + static void *zbuf; /* ARGSUSED */ @@ -100,17 +111,21 @@ null_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data __unused, static int zero_read(struct cdev *dev __unused, struct uio *uio, int flags __unused) { - int c; int error = 0; - while (uio->uio_resid > 0 && error == 0) { - c = uio->uio_resid < PAGE_SIZE ? uio->uio_resid : PAGE_SIZE; - error = uiomove(zbuf, c, uio); - } + while (uio->uio_resid > 0 && error == 0) + error = uiomove(zbuf, MIN(uio->uio_resid, PAGE_SIZE), uio); return (error); } +/* ARGSUSED */ +static int +full_write(struct cdev *dev __unused, struct uio *uio, int flags __unused) +{ + return (ENOSPC); +} + /* ARGSUSED */ static int null_modevent(module_t mod __unused, int type, void *data __unused) @@ -120,15 +135,18 @@ null_modevent(module_t mod __unused, int type, void *data __unused) if (bootverbose) printf("null: \n"); zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO); - zero_dev = make_dev(&zero_cdevsw, ZERO_MINOR, UID_ROOT, - GID_WHEEL, 0666, "zero"); null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT, GID_WHEEL, 0666, "null"); + zero_dev = make_dev(&zero_cdevsw, ZERO_MINOR, UID_ROOT, + GID_WHEEL, 0666, "zero"); + full_dev = make_dev(&full_cdevsw, FULL_MINOR, UID_ROOT, + GID_WHEEL, 0666, "full"); break; case MOD_UNLOAD: destroy_dev(null_dev); destroy_dev(zero_dev); + destroy_dev(full_dev); free(zbuf, M_TEMP); break; -- cgit v1.3