From owner-svn-src-all@freebsd.org Thu Dec 28 14:14:37 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 720E5EA0BAC; Thu, 28 Dec 2017 14:14:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C7717CE40; Thu, 28 Dec 2017 14:14:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBSEEa7H043375; Thu, 28 Dec 2017 14:14:36 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBSEEasG043373; Thu, 28 Dec 2017 14:14:36 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201712281414.vBSEEasG043373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Thu, 28 Dec 2017 14:14:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327287 - head/sys/i386/isa X-SVN-Group: head X-SVN-Commit-Author: pfg X-SVN-Commit-Paths: head/sys/i386/isa X-SVN-Commit-Revision: 327287 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Dec 2017 14:14:37 -0000 Author: pfg Date: Thu Dec 28 14:14:35 2017 New Revision: 327287 URL: https://svnweb.freebsd.org/changeset/base/327287 Log: sys/i386/isa/elink*: sync with (older) NetBSD. Make it easier to identify the point where we started diverging from NetBSD. Newer versions of these files have been updated to a new license so this information may become useful some day. Obtained from: NetBSD Modified: head/sys/i386/isa/elink.c head/sys/i386/isa/elink.h Modified: head/sys/i386/isa/elink.c ============================================================================== --- head/sys/i386/isa/elink.c Thu Dec 28 13:23:13 2017 (r327286) +++ head/sys/i386/isa/elink.c Thu Dec 28 14:14:35 2017 (r327287) @@ -1,7 +1,9 @@ +/* $NetBSD: elink.c,v 1.6 1995/01/07 21:37:54 mycroft Exp $ */ + /*- * SPDX-License-Identifier: BSD-4-Clause * - * Copyright (c) 1994 Charles Hannum. All rights reserved. + * Copyright (c) 1994, 1995 Charles Hannum. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -46,9 +48,9 @@ __FBSDID("$FreeBSD$"); #include /* - * Issue a `global reset' to all cards. We have to be careful to do this only - * once during autoconfig, to prevent resetting boards that have already been - * configured. + * Issue a `global reset' to all cards, and reset the ID state machines. We + * have to be careful to do the global reset only once during autoconfig, to + * prevent resetting boards that have already been configured. */ void elink_reset() @@ -59,8 +61,8 @@ elink_reset() x = 1; outb(ELINK_ID_PORT, ELINK_RESET); } - outb(ELINK_ID_PORT, 0); - outb(ELINK_ID_PORT, 0); + outb(ELINK_ID_PORT, 0x00); + outb(ELINK_ID_PORT, 0x00); return; } Modified: head/sys/i386/isa/elink.h ============================================================================== --- head/sys/i386/isa/elink.h Thu Dec 28 13:23:13 2017 (r327286) +++ head/sys/i386/isa/elink.h Thu Dec 28 14:14:35 2017 (r327287) @@ -1,3 +1,5 @@ +/* $NetBSD: elink.h,v 1.3 1994/10/27 04:17:11 cgd Exp $ */ + /*- * SPDX-License-Identifier: BSD-4-Clause *