Attachment #144016 for bug #191266

View | Details | Raw Unified | Return to bug 191266
Collapse All | Expand All




	const char	*desc;
	int		rid;
	int		rclk;
	int		regshft;
};

static const struct pci_id pci_ns8250_ids[] = {

{ 0x1415, 0x950b, 0xffff, 0, "Oxford Semiconductor OXCB950 Cardbus 16950 UART",
	0x10, 16384000 },
{ 0x14e4, 0x4344, 0xffff, 0, "Sony Ericsson GC89 PC Card", 0x10},
{ 0x14e4, 0x160a, 0xffff, 0, "Broadcom TruManage UART", 0x10, 128 * DEFAULT_RCLK, 2},
{ 0x151f, 0x0000, 0xffff, 0, "TOPIC Semiconductor TP560 56k modem", 0x10 },
{ 0x1fd4, 0x1999, 0x1fd4, 0x0001, "Sunix SER5xxxx Serial Port", 0x10,
	8 * DEFAULT_RCLK },

	return (ENXIO);

 match:
	result = uart_bus_probe(dev, id->regshft, id->rclk, id->rid, 0);
	/* Bail out on error. */
	if (result > 0)
		return (result);




	sc->sc_rrid = rid;
	sc->sc_rtype = SYS_RES_IOPORT;
	sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid,
	    0, ~0, uart_getrange(sc->sc_class) << regshft, RF_ACTIVE);
	if (sc->sc_rres == NULL) {
		sc->sc_rrid = rid;
		sc->sc_rtype = SYS_RES_MEMORY;
		sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype,
		    &sc->sc_rrid, 0, ~0, uart_getrange(sc->sc_class) << regshft,
		    RF_ACTIVE);
		if (sc->sc_rres == NULL)
			return (ENXIO);

Return to bug 191266

Lines 69-74 Link Here

(-)uart_bus_pci.c (-1 / +3 lines)
69	const char *desc;	69	const char *desc;
70	int rid;	70	int rid;
71	int rclk;	71	int rclk;
		72	int regshft;
72	};	73	};
73		74
74	static const struct pci_id pci_ns8250_ids[] = {	75	static const struct pci_id pci_ns8250_ids[] = {
Lines 113-118 Link Here
113	{ 0x1415, 0x950b, 0xffff, 0, "Oxford Semiconductor OXCB950 Cardbus 16950 UART",	114	{ 0x1415, 0x950b, 0xffff, 0, "Oxford Semiconductor OXCB950 Cardbus 16950 UART",
114	0x10, 16384000 },	115	0x10, 16384000 },
115	{ 0x14e4, 0x4344, 0xffff, 0, "Sony Ericsson GC89 PC Card", 0x10},	116	{ 0x14e4, 0x4344, 0xffff, 0, "Sony Ericsson GC89 PC Card", 0x10},
		117	{ 0x14e4, 0x160a, 0xffff, 0, "Broadcom TruManage UART", 0x10, 128 * DEFAULT_RCLK, 2},
116	{ 0x151f, 0x0000, 0xffff, 0, "TOPIC Semiconductor TP560 56k modem", 0x10 },	118	{ 0x151f, 0x0000, 0xffff, 0, "TOPIC Semiconductor TP560 56k modem", 0x10 },
117	{ 0x1fd4, 0x1999, 0x1fd4, 0x0001, "Sunix SER5xxxx Serial Port", 0x10,	119	{ 0x1fd4, 0x1999, 0x1fd4, 0x0001, "Sunix SER5xxxx Serial Port", 0x10,
118	8 * DEFAULT_RCLK },	120	8 * DEFAULT_RCLK },
Lines 182-188 Link Here
182	return (ENXIO);	184	return (ENXIO);
183		185
184	match:	186	match:
185	result = uart_bus_probe(dev, 0, id->rclk, id->rid, 0);	187	result = uart_bus_probe(dev, id->regshft, id->rclk, id->rid, 0);
186	/* Bail out on error. */	188	/* Bail out on error. */
187	if (result > 0)	189	if (result > 0)
188	return (result);	190	return (result);

Lines 352-363 Link Here

(-)uart_core.c (-2 / +2 lines)
352	sc->sc_rrid = rid;	352	sc->sc_rrid = rid;
353	sc->sc_rtype = SYS_RES_IOPORT;	353	sc->sc_rtype = SYS_RES_IOPORT;
354	sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid,	354	sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid,
355	0, ~0, uart_getrange(sc->sc_class), RF_ACTIVE);	355	0, ~0, uart_getrange(sc->sc_class) << regshft, RF_ACTIVE);
356	if (sc->sc_rres == NULL) {	356	if (sc->sc_rres == NULL) {
357	sc->sc_rrid = rid;	357	sc->sc_rrid = rid;
358	sc->sc_rtype = SYS_RES_MEMORY;	358	sc->sc_rtype = SYS_RES_MEMORY;
359	sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype,	359	sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype,
360	&sc->sc_rrid, 0, ~0, uart_getrange(sc->sc_class),	360	&sc->sc_rrid, 0, ~0, uart_getrange(sc->sc_class) << regshft,
361	RF_ACTIVE);	361	RF_ACTIVE);
362	if (sc->sc_rres == NULL)	362	if (sc->sc_rres == NULL)
363	return (ENXIO);	363	return (ENXIO);