diff options
author | phk <phk@FreeBSD.org> | 1996-05-03 21:01:54 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1996-05-03 21:01:54 +0000 |
commit | 5d01dc3d502f27448cc5a6c62c8f103d25ac3df0 (patch) | |
tree | 6e409b4bdf1f55b895a65877ef5486cfc5442060 /sys/pci/meteor.c | |
parent | 6ed0fd2b8bab9bd3b84ab82f273df31ce328c87d (diff) | |
download | FreeBSD-src-5d01dc3d502f27448cc5a6c62c8f103d25ac3df0.zip FreeBSD-src-5d01dc3d502f27448cc5a6c62c8f103d25ac3df0.tar.gz |
Another sweep over the pmap/vm macros, this time with more focus on
the usage. I'm not satisfied with the naming, but now at least there is
less bogus stuff around.
Diffstat (limited to 'sys/pci/meteor.c')
-rw-r--r-- | sys/pci/meteor.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c index cf19e00..fd2f72a 100644 --- a/sys/pci/meteor.c +++ b/sys/pci/meteor.c @@ -1509,8 +1509,7 @@ meteor_ioctl(dev_t dev, int cmd, caddr_t arg, int flag, struct proc *pr) return(EINVAL); /* meteor_mem structure is on the page after the data */ mem = mtr->mem = (struct meteor_mem *) (mtr->bigbuf + - ((mtr->frame_size * - mtr->frames+PAGE_SIZE-1)/PAGE_SIZE)*PAGE_SIZE); + (round_page(mtr->frame_size * mtr->frames))); mtr->current = 1; mtr->synch_wait = 0; mem->num_bufs = mtr->frames; @@ -1599,7 +1598,7 @@ meteor_ioctl(dev_t dev, int cmd, caddr_t arg, int flag, struct proc *pr) /* meteor_mem structure for SYNC Capture */ if (geo->frames > 1) temp += PAGE_SIZE; - temp = (temp + PAGE_SIZE -1)/PAGE_SIZE; + temp = btoc(temp); if (temp > mtr->alloc_pages #ifdef METEOR_TEST_VIDEO && mtr->video.addr == 0 |