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

Sync with sys/i386/i386/usercnofig.c revision 1.142.

Browse Source
This commit is contained in:
KATO Takenori 1999-05-11 08:36:12 +00:00
parent f574e34636
commit a19ce74ea1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=47000
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/pc98/i386/userconfig.c
View File

@ -46,7 +46,7 @@
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
** $Id: userconfig.c,v 1.76 1999/05/06 09:15:20 kato Exp $
** $Id: userconfig.c,v 1.77 1999/05/09 04:30:08 kato Exp $
**/
/**
@ -1041,11 +1041,10 @@ findconflict(DEV_LIST *list)
if ((dp->drq > 0) && /* drq conflict? */
(dp->drq == sp->drq))
dp->conflicts = 1;
if ((dp->maddr > 0) && /* maddr conflict? */
(dp->maddr == sp->maddr))
dp->conflicts = 1;
if ((dp->msize > 0) && /* msize conflict? */
(dp->msize == sp->msize))
if ((sp->maddr > 0) && /* maddr/msize conflict? */
(dp->maddr > 0) &&
(sp->maddr + ((sp->msize == 0) ? 1 : sp->msize) > dp->maddr) &&
(dp->maddr + ((dp->msize == 0) ? 1 : dp->msize) > sp->maddr))
dp->conflicts = 1;
}
count += dp->conflicts; /* count conflicts */
@ -2555,7 +2554,7 @@ visuserconfig(void)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: userconfig.c,v 1.76 1999/05/06 09:15:20 kato Exp $
* $Id: userconfig.c,v 1.77 1999/05/09 04:30:08 kato Exp $
*/
#include "scbus.h"