Deleted Added
full compact
si_isa.c (100744) si_isa.c (106572)
1/*
2 * Device driver for Specialix range (SI/XIO) of serial line multiplexors.
3 *
4 * Copyright (C) 2000, Peter Wemm <peter@netplex.com.au>
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright
10 * notices, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notices, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution.
14 *
15 * THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY EXPRESS OR IMPLIED
16 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
17 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
18 * NO EVENT SHALL THE AUTHORS BE LIABLE.
19 *
1/*
2 * Device driver for Specialix range (SI/XIO) of serial line multiplexors.
3 *
4 * Copyright (C) 2000, Peter Wemm <peter@netplex.com.au>
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright
10 * notices, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notices, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution.
14 *
15 * THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY EXPRESS OR IMPLIED
16 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
17 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
18 * NO EVENT SHALL THE AUTHORS BE LIABLE.
19 *
20 * $FreeBSD: head/sys/dev/si/si_isa.c 100744 2002-07-27 08:46:28Z peter $
20 * $FreeBSD: head/sys/dev/si/si_isa.c 106572 2002-11-07 19:56:21Z jhb $
21 */
22
23#include "opt_debug_si.h"
24
25#include <sys/param.h>
26#include <sys/systm.h>
27#include <sys/kernel.h>
28#include <sys/bus.h>

--- 44 unchanged lines hidden (view full) ---

73 * and ram conflicts in the >1M and <16M region.
74 */
75 if ((caddr_t)paddr < (caddr_t)0xA0000 ||
76 (caddr_t)paddr >= (caddr_t)0x100000) {
77 device_printf(dev, "maddr (%p) out of range\n", paddr);
78 goto fail;
79 }
80
21 */
22
23#include "opt_debug_si.h"
24
25#include <sys/param.h>
26#include <sys/systm.h>
27#include <sys/kernel.h>
28#include <sys/bus.h>

--- 44 unchanged lines hidden (view full) ---

73 * and ram conflicts in the >1M and <16M region.
74 */
75 if ((caddr_t)paddr < (caddr_t)0xA0000 ||
76 (caddr_t)paddr >= (caddr_t)0x100000) {
77 device_printf(dev, "maddr (%p) out of range\n", paddr);
78 goto fail;
79 }
80
81 if (((u_int)paddr & 0x7fff) != 0) {
81 if (((uintptr_t)paddr & 0x7fff) != 0) {
82 device_printf(dev, "maddr (%p) not on 32k boundary\n", paddr);
83 goto fail;
84 }
85
86 /* Is there anything out there? (0x17 is just an arbitrary number) */
87 *maddr = 0x17;
88 if (*maddr != 0x17) {
89 device_printf(dev, "0x17 check fail at phys %p\n", paddr);

--- 245 unchanged lines hidden ---
82 device_printf(dev, "maddr (%p) not on 32k boundary\n", paddr);
83 goto fail;
84 }
85
86 /* Is there anything out there? (0x17 is just an arbitrary number) */
87 *maddr = 0x17;
88 if (*maddr != 0x17) {
89 device_printf(dev, "0x17 check fail at phys %p\n", paddr);

--- 245 unchanged lines hidden ---