Date: Fri, 18 May 2012 09:53:40 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 211317 for review Message-ID: <201205180953.q4I9re8C030635@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@211317?ac=10 Change 211317 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/18 09:52:58 Clean up several nits in the avgen(4) driver: - Properly check access permissions on read(2)/write(2), they were inverted. - Use the right hint name in device.hints for memory mapped I/O permission. - Clean up make_dev(9) use when no unit is requested. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI.hints#12 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/avgen/altera_avgen.c#2 (text+ko) ==== @@ -87,7 +87,7 @@ int error; sc = dev->si_drv1; - if ((sc->avg_flags & ALTERA_AVALON_FLAG_READ) != 0) + if ((sc->avg_flags & ALTERA_AVALON_FLAG_READ) == 0) return (EACCES); width = sc->avg_width; if (uio->uio_offset < 0 || uio->uio_offset % width != 0 || @@ -149,7 +149,7 @@ int error; sc = dev->si_drv1; - if ((sc->avg_flags & ALTERA_AVALON_FLAG_WRITE) != 0) + if ((sc->avg_flags & ALTERA_AVALON_FLAG_WRITE) == 0) return (EACCES); width = sc->avg_width; if (uio->uio_offset < 0 || uio->uio_offset % width != 0 || @@ -399,8 +399,12 @@ str_devname = "altera_avgen%d"; devunit = sc->avg_unit; } - sc->avg_cdev = make_dev(&avg_cdevsw, sc->avg_unit, UID_ROOT, - GID_WHEEL, S_IRUSR | S_IWUSR, str_devname, devunit); + if (devunit != -1) + sc->avg_cdev = make_dev(&avg_cdevsw, sc->avg_unit, UID_ROOT, + GID_WHEEL, S_IRUSR | S_IWUSR, str_devname, devunit); + else + sc->avg_cdev = make_dev(&avg_cdevsw, sc->avg_unit, UID_ROOT, + GID_WHEEL, S_IRUSR | S_IWUSR, str_devname); if (sc->avg_cdev == NULL) { device_printf(sc->avg_dev, "%s: make_dev failed\n", __func__); error = ENXIO; ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI.hints#12 (text+ko) ==== @@ -40,5 +40,5 @@ hint.altera_avgen.0.msize=0x4000000 hint.altera_avgen.0.width=2 hint.altera_avgen.0.fileio="rw" -hint.altera_avgen.0.memio="rwx" +hint.altera_avgen.0.mmapio="rwx" hint.altera_avgen.0.devname="de4flash"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205180953.q4I9re8C030635>