Author: pfg
Date: Fri Dec 29 00:27:12 2017
New Revision: 327329
URL: https://svnweb.freebsd.org/changeset/base/327329
Log:
dev/txp: Update if_txpreg.h to match OpenBSD's version.
Resolve a minor mismatch: TXP_CMD_READ_VERSION instead of
TXP_CMD_VERSIONS_READ.
Curiously the later is defined but not used in OpenBSD.
Obtained from: OpenBSD (CVS 1.31-1.34)
MFC after: 1 week
Modified:
head/sys/dev/txp/if_txp.c
head/sys/dev/txp/if_txpreg.h
Modified: head/sys/dev/txp/if_txp.c
==============================================================================
--- head/sys/dev/txp/if_txp.c Fri Dec 29 00:21:50 2017 (r327328)
+++ head/sys/dev/txp/if_txp.c Fri Dec 29 00:27:12 2017 (r327329)
@@ -373,7 +373,7 @@ txp_attach(device_t dev)
* diagnose sleep image specific issues.
*/
rsp = NULL;
- if (txp_ext_command(sc, TXP_CMD_READ_VERSION, 0, 0, 0, NULL, 0,
+ if (txp_ext_command(sc, TXP_CMD_VERSIONS_READ, 0, 0, 0, NULL, 0,
&rsp, TXP_CMD_WAIT)) {
device_printf(dev, "can not read sleep image version\n");
error = ENXIO;
Modified: head/sys/dev/txp/if_txpreg.h
==============================================================================
--- head/sys/dev/txp/if_txpreg.h Fri Dec 29 00:21:50 2017
(r327328)
+++ head/sys/dev/txp/if_txpreg.h Fri Dec 29 00:27:12 2017
(r327329)
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_txpreg.h,v 1.30 2001/06/23 04:18:02 jason Exp $ */
+/* $OpenBSD: if_txpreg.h,v 1.34 2001/11/05 17:25:58 art Exp $ */
/* $FreeBSD$ */
/*-
@@ -166,7 +166,7 @@
#define TXP_CMD_FILTER_TABLE_MODE_WRITE 0x3d
#define TXP_CMD_FILTER_TCL_WRITE 0x3e
#define TXP_CMD_FILTER_TBL_READ 0x3f
-#define TXP_CMD_READ_VERSION 0x43
+#define TXP_CMD_VERSIONS_READ 0x43
#define TXP_CMD_FILTER_DEFINE 0x45
#define TXP_CMD_ADD_WAKEUP_PKT 0x46
#define TXP_CMD_ADD_SLEEP_PKT 0x47
@@ -384,6 +384,7 @@ struct txp_frag_desc {
#define FRAG_FLAGS_TYPE_OPT 0x03 /* type: options */
#define FRAG_FLAGS_TYPE_RX 0x04 /* type: command */
#define FRAG_FLAGS_TYPE_RESP 0x05 /* type: response */
+#define FRAG_FLAGS_VALID 0x80 /* valid descriptor */
struct txp_opt_desc {
uint8_t opt_desctype:3,
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
