svn commit: r331852 - in head: stand/i386/libfirewire sys/dev/firewire

[Warner Losh]

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 <bootstrap.h>
 #include <btxv86.h>
 #include <libi386.h>
+#include <dev/firewire/firewire.h>
 #include "fwohci.h"
 #include <dev/dcons/dcons.h>
 

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 <btxv86.h>
 #include <bootstrap.h>
 
+#include <dev/firewire/firewire.h>
 #include "fwohci.h"
-#include "fwohcireg.h"
+#include <dev/firewire/fwohcireg.h>
 #include <dev/firewire/firewire_phy.h>
 
 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.