Date: Fri, 25 May 2012 22:15:02 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 211755 for review Message-ID: <201205252215.q4PMF2fL027028@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@211755?ac=10 Change 211755 by brooks@brooks_ecr_current on 2012/05/25 22:14:11 Massage isf(4) so that it compiles. Not hooked up as I've not verified that it doesn't panic much less that it works. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.c#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.h#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf_nexus.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.c#2 (text+ko) ==== @@ -81,32 +81,35 @@ } #endif -isf_read(struct isf_softc *sc, uint64_t off, void *data, size_t len) +static void +isf_read(struct isf_softc *sc, off_t off, void *data, size_t len) { KASSERT((uintptr_t)data % 2 == 0, ("%s: unaligned data %p", __func__, data)); KASSERT((len <= ISF_SECTORSIZE) && (len % 2 == 0), ("%s: invalid length %ju", __func__, len)); - KASSERT(off % ISF_SECTORLEN == 0, + KASSERT(off % ISF_SECTORSIZE == 0, ("%s: invalid offset %ju\n", __func__, off)); bus_read_region_2(sc->isf_res, off, (uint16_t *)data, len / 2); } +#ifdef NOTYET static void -isf_write(struct isf_softc *sc, uint64_t off, void *data, size_t len) +isf_write(struct isf_softc *sc, off_t off, void *data, size_t len) { KASSERT((uintptr_t)data % 2 == 0, ("%s: unaligned data %p", __func__, data)); KASSERT((len <= ISF_SECTORSIZE) && (len % 2 == 0), ("%s: invalid length %ju", __func__, len)); - KASSERT(off % ISF_SECTORLEN == 0, + KASSERT(off % ISF_SECTORSIZE == 0, ("%s: invalid offset %ju\n", __func__, off)); bus_write_region_2(sc->isf_res, off, (uint16_t *)data, len / 2); } +#endif /* * disk(9) methods. @@ -156,7 +159,7 @@ case BIO_WRITE: error = ENXIO; -#if 0 +#ifdef NOTYET /* * XXXRW: copied and pasted from altera_sdcard -- obviously * won't work. @@ -174,14 +177,12 @@ bp->bio_resid = 0; biofinish(bp, NULL, error); ISF_UNLOCK(sc); - return (error); } -void +static void isf_disk_insert(struct isf_softc *sc) { struct disk *disk; - uint64_t size; disk = disk_alloc(); disk->d_drv1 = sc; @@ -225,18 +226,21 @@ start = rman_get_start(sc->isf_res); if (start % 2 != 0) { - device_printf(sc, "Unsupported flash start alignment %llu\n", + device_printf(sc->isf_dev, + "Unsupported flash start alignment %lu\n", start); return (ENXIO); } size = rman_get_size(sc->isf_res); if (size != ISF_MEDIASIZE) { - device_printf(sc, "Unsupported flash size %llu\n", size); + device_printf(sc->isf_dev, + "Unsupported flash size %lu\n", size); return (ENXIO); } ISF_LOCK_INIT(sc); sc->isf_disk = NULL; isf_disk_insert(sc); + return(0); } void ==== //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.h#2 (text+ko) ==== @@ -63,7 +63,7 @@ MTX_DEF) #define ISF_UNLOCK(sc) mtx_unlock(&(sc)->isf_lock) -void isf_attach(struct isf_softc *sc); +int isf_attach(struct isf_softc *sc); void isf_detach(struct isf_softc *sc); #endif /* _DEV_ISF_H_ */ ==== //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf_nexus.c#2 (text+ko) ==== @@ -68,7 +68,8 @@ static int isf_nexus_attach(device_t dev) { - struct isf_softc *sc; + int error; + struct isf_softc *sc; sc = device_get_softc(dev); sc->isf_dev = dev;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205252215.q4PMF2fL027028>