PERFORCE change 31028 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=31028

Change 31028 by peter at peter_daintree on 2003/05/12 13:06:28

	IFC @31027

Affected files ...

.. //depot/projects/hammer/crypto/openssh/log.h#3 integrate
.. //depot/projects/hammer/sys/pci/if_dc.c#10 integrate
.. //depot/projects/hammer/sys/pci/if_dcreg.h#6 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#14 integrate
.. //depot/projects/hammer/usr.sbin/pppd/main.c#3 integrate

Differences ...

==== //depot/projects/hammer/crypto/openssh/log.h#3 (text+ko) ====

@@ -1,4 +1,5 @@
 /*	$OpenBSD: log.h,v 1.8 2002/07/19 15:43:33 markus Exp $	*/
+/*	$FreeBSD: src/crypto/openssh/log.h,v 1.2 2003/05/12 19:22:47 des Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
@@ -53,13 +54,21 @@
 SyslogFacility	log_facility_number(char *);
 LogLevel log_level_number(char *);
 
-void     fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     error(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     log(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     debug(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
+#define fatal	ssh_fatal
+#define error	ssh_error
+#define log	ssh_log
+#define verbose	ssh_verbose
+#define debug	ssh_debug
+#define debug2	ssh_debug2
+#define debug3	ssh_debug3
+
+void     ssh_fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_error(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_log(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_debug(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     ssh_debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
 
 void     fatal_cleanup(void);
 void     fatal_add_cleanup(void (*) (void *), void *);

==== //depot/projects/hammer/sys/pci/if_dc.c#10 (text+ko) ====

@@ -46,6 +46,7 @@
  * Xircom X3201 (www.xircom.com)
  * Abocom FE2500
  * Conexant LANfinity (www.conexant.com)
+ * 3Com OfficeConnect 10/100B 3CSOHO100B (www.3com.com)
  *
  * Datasheets for the 21143 are available at developer.intel.com.
  * Datasheets for the clone parts can be found at their respective sites.
@@ -88,7 +89,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.106 2003/05/01 09:31:01 mbr Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.107 2003/05/12 19:50:20 mbr Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -196,6 +197,8 @@
 		"Hawking CB102 CardBus 10/100" },
 	{ DC_VENDORID_PLANEX, DC_DEVICEID_FNW3602T,
 		"PlaneX FNW-3602-T CardBus 10/100" },
+	{ DC_VENDORID_3COM, DC_DEVICEID_3CSOHOB,
+		"3Com OfficeConnect 10/100B" },
 	{ 0, 0, NULL }
 };
 
@@ -1987,6 +1990,7 @@
 	case DC_DEVICEID_FE2500:
 	case DC_DEVICEID_EN2242:
 	case DC_DEVICEID_HAWKING_PN672TX:
+	case DC_DEVICEID_3CSOHOB:
 		sc->dc_type = DC_TYPE_AN985;
 		sc->dc_flags |= DC_64BIT_HASH;
 		sc->dc_flags |= DC_TX_USE_TX_INTR;

==== //depot/projects/hammer/sys/pci/if_dcreg.h#6 (text+ko) ====

@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_dcreg.h,v 1.31 2003/04/18 15:42:25 sanpei Exp $
+ * $FreeBSD: src/sys/pci/if_dcreg.h,v 1.32 2003/05/12 19:50:20 mbr Exp $
  */
 
 /*
@@ -868,6 +868,16 @@
 #define DC_DEVICEID_AN985	0x0985
 
 /*
+ * 3COM PCI vendor ID
+ */
+#define DC_VENDORID_3COM	0x10b7
+
+/*
+ * 3COM OfficeConnect 10/100B (3CSOHO100B-TX)
+ */
+#define DC_DEVICEID_3CSOHOB	0x9300
+
+/*
  * ASIX vendor ID.
  */
 #define DC_VENDORID_ASIX	0x125B

==== //depot/projects/hammer/usr.sbin/Makefile#14 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.251 2003/05/09 21:06:41 peter Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.252 2003/05/12 18:51:31 peter Exp $
 
 .if ${MACHINE_ARCH} != "powerpc"
 _sysinstall=sysinstall

==== //depot/projects/hammer/usr.sbin/pppd/main.c#3 (text+ko) ====

@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/main.c,v 1.20 2002/07/30 03:49:27 peter Exp $";
+static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/main.c,v 1.21 2003/05/12 18:51:31 peter Exp $";
 #endif
 
 #include <stdio.h>