D59623.id.diff
No OneTemporary
Actions

Size

920 B

Referenced Files

None

Subscribers

None

D59623.id.diff
View Options

	diff --git a/sys/dev/puc/puc_cfg.h b/sys/dev/puc/puc_cfg.h
	--- a/sys/dev/puc/puc_cfg.h
	+++ b/sys/dev/puc/puc_cfg.h
	@@ -52,6 +52,9 @@
	#define PUC_ILR_DIGI 1
	#define PUC_ILR_QUATECH 2

	+/* Configuration flags. */
	+#define PUC_FLAGS_NO_MSI 0x01
	+
	/* Configuration queries. */
	enum puc_cfg_cmd {
	PUC_CFG_GET_CLOCK,
	@@ -80,6 +83,7 @@
	int8_t rid; /* Rid of first port */
	int8_t d_rid; /* Delta rid of next ports */
	int8_t d_ofs; /* Delta offset of next ports */
	+ uint8_t flags; /* PUC_FLAGS_* */
	puc_config_f *config_function;
	};

	diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
	--- a/sys/dev/puc/puc_pci.c
	+++ b/sys/dev/puc/puc_pci.c
	@@ -133,7 +133,9 @@

	sc = device_get_softc(dev);

	- if (!puc_msi_disable) {
	+ if (!puc_msi_disable &&
	+ (sc->sc_cfg->flags & PUC_FLAGS_NO_MSI) == 0 &&
	+ pci_msi_count(dev) == 1) {
	count = 1;

	if (pci_alloc_msi(dev, &count) == 0) {