PERFORCE change 193070 for review

[John Baldwin]

http://p4web.freebsd.org/@@193070?ac=10

Change 193070 by jhb at jhb_jhbbsd on 2011/05/13 17:34:30

	Compile.

Affected files ...

.. //depot/projects/pci/sys/x86/x86/mptable.c#7 edit
.. //depot/projects/pci/sys/x86/x86/mptable_pci.c#8 edit

Differences ...

==== //depot/projects/pci/sys/x86/x86/mptable.c#7 (text+ko) ====

@@ -1106,8 +1106,8 @@
 mptable_host_res_handler(ext_entry_ptr entry, void *arg)
 {
 	struct host_res_args *args;
-	cbasm_entry_ptr *cbasm;
-	sas_entry_ptr *sas;
+	cbasm_entry_ptr cbasm;
+	sas_entry_ptr sas;
 	const char *name;
 	uint64_t start, end;
 	int error, *flagp, flags, type;
@@ -1115,7 +1115,7 @@
 	args = arg;
 	switch (entry->type) {
 	case MPCT_EXTENTRY_SAS:
-		sas = (sas_entry_ptr *)entry;
+		sas = (sas_entry_ptr)entry;
 		if (sas->bus_id != args->bus)
 			break;
 		switch (sas->address_type) {
@@ -1131,6 +1131,11 @@
 			type = SYS_RES_MEMORY;
 			flags = RF_PREFETCHABLE;
 			break;
+		default:
+			printf(
+	    "MPTable: Unknown systems address space type for bus %u: %d\n",
+			    sas->bus_id, sas->address_type);
+			return;
 		}
 		start = sas->address_base;
 		end = sas->address_base + sas->address_length - 1;
@@ -1148,14 +1153,14 @@
 			end = ULONG_MAX;
 		}
 #endif
-		error = pcib_host_res_decodes(&args->sc->sc_host_res, type, start, end,
-		    flags);
+		error = pcib_host_res_decodes(&args->sc->sc_host_res, type,
+		    start, end, flags);
 		if (error)
 			panic("Failed to manage %d range (%#jx-%#jx): %d", type,
 			    (uintmax_t)start, (uintmax_t)end, error);
 		break;
 	case MPCT_EXTENTRY_CBASM:
-		cbasm = (cbasm_entry_ptr *)entry;
+		cbasm = (cbasm_entry_ptr)entry;
 		if (cbasm->bus_id != args->bus)
 			break;
 		switch (cbasm->predefined_range) {
@@ -1169,27 +1174,30 @@
 			break;
 		default:
 			printf(
-		    "MPTable: Unknown compatiblity address space range for bus %u: %d\n",
+    "MPTable: Unknown compatiblity address space range for bus %u: %d\n",
 			    cbasm->bus_id, cbasm->predefined_range);
 			return;
 		}
 		if (*flagp != 0)
-			printf("MPTable: Duplicate compatibility %s range for bus %u\n",
+			printf(
+		    "MPTable: Duplicate compatibility %s range for bus %u\n",
 			    name, cbasm->bus_id);
 		switch (cbasm->address_mod) {
 		case CBASMENTRY_ADDRESS_MOD_ADD:
 			*flagp = 1;
 			if (bootverbose)
-				device_printf(args->dev, "decoding %s ports\n", name);
+				device_printf(args->dev, "decoding %s ports\n",
+				    name);
 			break;
 		case CBASMENTRY_ADDRESS_MOD_SUBTRACT:
 			*flagp = -1;
 			if (bootverbose)
-				device_printf(args->dev, "not decoding %s ports\n", name);
+				device_printf(args->dev,
+				    "not decoding %s ports\n", name);
 			break;
 		default:
 			printf(
-			    "MPTable: Unknown compatibility address space modifier: %u\n",
+	    "MPTable: Unknown compatibility address space modifier: %u\n",
 			    cbasm->address_mod);
 			break;
 		}

==== //depot/projects/pci/sys/x86/x86/mptable_pci.c#8 (text+ko) ====

@@ -68,7 +68,6 @@
 static int
 mptable_hostb_attach(device_t dev)
 {
-	struct mptable_hostb_softc *sc;
 
 #ifdef NEW_PCIB
 	mptable_pci_host_res_init(dev);
@@ -115,10 +114,10 @@
 
 	if (end >= 0x10000)
 		return (0);
-	if (start & 0xfc00 != end & 0xfc00)
+	if ((start & 0xfc00) != (end & 0xfc00))
 		return (0);
 	start &= ~0xfc00;
-	end &- ~0xfc00;
+	end &= ~0xfc00;
 	return (start >= 0x100 && end <= 0x3ff);
 }
 
@@ -127,10 +126,10 @@
 {
 	if (end >= 0x10000)
 		return (0);
-	if (start & 0xfc00 != end & 0xfc00)
+	if ((start & 0xfc00) != (end & 0xfc00))
 		return (0);
 	start &= ~0xfc00;
-	end &- ~0xfc00;
+	end &= ~0xfc00;
 	return (pci_is_vga_ioport_range(start, end));
 }
 
@@ -182,8 +181,13 @@
 	DEVMETHOD(bus_print_child,	bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,	legacy_pcib_read_ivar),
 	DEVMETHOD(bus_write_ivar,	legacy_pcib_write_ivar),
+#ifdef NEW_PCIB
 	DEVMETHOD(bus_alloc_resource,	legacy_pcib_alloc_resource),
 	DEVMETHOD(bus_adjust_resource,	bus_generic_adjust_resource),
+#else
+	DEVMETHOD(bus_alloc_resource,	legacy_pcib_alloc_resource),
+	DEVMETHOD(bus_adjust_resource,	bus_generic_adjust_resource),
+#endif
 	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
 	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),