From owner-svn-src-head@freebsd.org Sat Mar 31 22:03:00 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D377F546E4; Sat, 31 Mar 2018 22:03:00 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3317F77F23; Sat, 31 Mar 2018 22:03:00 +0000 (UTC) (envelope-from imp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14CB21DB14; Sat, 31 Mar 2018 22:03:00 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2VM2xGC047654; Sat, 31 Mar 2018 22:02:59 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2VM2xHt047650; Sat, 31 Mar 2018 22:02:59 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201803312202.w2VM2xHt047650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 31 Mar 2018 22:02:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331852 - in head: stand/i386/libfirewire sys/dev/firewire X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: stand/i386/libfirewire sys/dev/firewire X-SVN-Commit-Revision: 331852 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Mar 2018 22:03:00 -0000 Author: imp Date: Sat Mar 31 22:02:59 2018 New Revision: 331852 URL: https://svnweb.freebsd.org/changeset/base/331852 Log: fwohcireg.h is 99% the same between the boot loader and the kernel. Delete it and fix up the 1% difference because there's no need for them to be different. Deleted: head/stand/i386/libfirewire/fwohcireg.h Modified: head/stand/i386/libfirewire/firewire.c head/stand/i386/libfirewire/fwohci.c head/stand/i386/libfirewire/fwohci.h head/sys/dev/firewire/fwohcireg.h Modified: head/stand/i386/libfirewire/firewire.c ============================================================================== --- head/stand/i386/libfirewire/firewire.c Sat Mar 31 19:21:57 2018 (r331851) +++ head/stand/i386/libfirewire/firewire.c Sat Mar 31 22:02:59 2018 (r331852) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "fwohci.h" #include Modified: head/stand/i386/libfirewire/fwohci.c ============================================================================== --- head/stand/i386/libfirewire/fwohci.c Sat Mar 31 19:21:57 2018 (r331851) +++ head/stand/i386/libfirewire/fwohci.c Sat Mar 31 22:02:59 2018 (r331852) @@ -39,8 +39,9 @@ #include #include +#include #include "fwohci.h" -#include "fwohcireg.h" +#include #include static uint32_t fwphy_wrdata ( struct fwohci_softc *, uint32_t, uint32_t); @@ -62,12 +63,6 @@ char *linkspeed[] = { "S100", "S200", "S400", "S800", "S1600", "S3200", "undef", "undef" }; - -#define FW_EUI64_BYTE(eui, x) \ - ((((x)<4)? \ - ((eui)->hi >> (8*(3-(x)))): \ - ((eui)->lo >> (8*(7-(x)))) \ - ) & 0xff) /* * Communication with PHY device Modified: head/stand/i386/libfirewire/fwohci.h ============================================================================== --- head/stand/i386/libfirewire/fwohci.h Sat Mar 31 19:21:57 2018 (r331851) +++ head/stand/i386/libfirewire/fwohci.h Sat Mar 31 22:02:59 2018 (r331852) @@ -37,10 +37,6 @@ #define MAX_OHCI 5 #define CROMSIZE 0x400 -struct fw_eui64 { - uint32_t hi, lo; -}; - struct fwohci_softc { uint32_t locator; uint32_t devid; Modified: head/sys/dev/firewire/fwohcireg.h ============================================================================== --- head/sys/dev/firewire/fwohcireg.h Sat Mar 31 19:21:57 2018 (r331851) +++ head/sys/dev/firewire/fwohcireg.h Sat Mar 31 22:02:59 2018 (r331852) @@ -330,6 +330,7 @@ struct ohci_registers { struct ohci_dma dma_irch[0x20]; }; +#ifndef _STANDALONE struct fwohcidb_tr { STAILQ_ENTRY(fwohcidb_tr) link; struct fw_xfer *xfer; @@ -339,6 +340,7 @@ struct fwohcidb_tr { bus_addr_t bus_addr; int dbcnt; }; +#endif /* * OHCI info structure.