d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cope with non page-aligned arguments to ioperm.

Browse Source
This commit is contained in:
Doug Rabson 1999-05-22 17:35:04 +00:00
parent 4b139d33a7
commit a604540eab
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/libio/bwx.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: bwx.c,v 1.1 1998/12/12 18:05:06 dfr Exp $
*/
#include <sys/param.h>
@ -70,21 +70,26 @@ bwx_init()
static int
bwx_ioperm(u_int32_t from, u_int32_t num, int on)
{
u_int32_t start, end;
if (!bwx_int1_ports)
bwx_init();
if (!on)
return -1; /* XXX can't unmap yet */
munmap(bwx_int1_ports + from, num);
munmap(bwx_int2_ports + from, num);
munmap(bwx_int4_ports + from, num);
mmap(bwx_int1_ports + from, num, PROT_READ|PROT_WRITE, MAP_SHARED,
mem_fd, bwx_io_base + BWX_EV56_INT1 + from);
mmap(bwx_int2_ports + from, num, PROT_READ|PROT_WRITE, MAP_SHARED,
mem_fd, bwx_io_base + BWX_EV56_INT2 + from);
mmap(bwx_int4_ports + from, num, PROT_READ|PROT_WRITE, MAP_SHARED,
mem_fd, bwx_io_base + BWX_EV56_INT4 + from);
start = trunc_page(from);
end = round_page(from + num);
munmap(bwx_int1_ports + start, end-start);
munmap(bwx_int2_ports + start, end-start);
munmap(bwx_int4_ports + start, end-start);
mmap(bwx_int1_ports + start, end-start, PROT_READ|PROT_WRITE, MAP_SHARED,
mem_fd, bwx_io_base + BWX_EV56_INT1 + start);
mmap(bwx_int2_ports + start, end-start, PROT_READ|PROT_WRITE, MAP_SHARED,
mem_fd, bwx_io_base + BWX_EV56_INT2 + start);
mmap(bwx_int4_ports + start, end-start, PROT_READ|PROT_WRITE, MAP_SHARED,
mem_fd, bwx_io_base + BWX_EV56_INT4 + start);
return 0;
}

6
lib/libio/swiz.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: swiz.c,v 1.1 1998/12/12 18:05:06 dfr Exp $
*/
#include <sys/param.h>
@ -86,8 +86,8 @@ swiz_ioperm(u_int32_t from, u_int32_t num, int on)
if (!on)
return -1; /* XXX can't unmap yet */
start = from << 5;
end = (from + num) << 5;
start = trunc_page(from << 5);
end = round_page((from + num) << 5);
addr = swiz_ports + start;
munmap(addr, end - start);
mmap(addr, end - start, PROT_READ|PROT_WRITE, MAP_SHARED,