Changeset View

Standalone View

	Show First 20 Lines • Show All 68 Lines • ▼ Show 20 Lines
	int			int
	ed_probe_3Com(device_t dev, int port_rid, int flags)			ed_probe_3Com(device_t dev, int port_rid, int flags)
	{			{
	struct ed_softc *sc = device_get_softc(dev);			struct ed_softc *sc = device_get_softc(dev);
	int error;			int error;
	int i;			int i;
	u_int memsize;			u_int memsize;
	u_char isa16bit;			u_char isa16bit;
	u_long conf_maddr, conf_msize, irq, junk, pmem;			rman_res_t conf_maddr, conf_msize, irq, junk, pmem;

	error = ed_alloc_port(dev, 0, ED_3COM_IO_PORTS);			error = ed_alloc_port(dev, 0, ED_3COM_IO_PORTS);
	if (error)			if (error)
	jhbUnsubmitted Done Inline Actions This line should be restored. jhb: This line should be restored.
	jhibbitsAuthorUnsubmitted Not Done Inline Actions Hmm, this must've been a merge problem. This delete wasn't in my original patch and this diff is purely a reduction of the other patch. jhibbits: Hmm, this must've been a merge problem. This delete wasn't in my original patch and this diff…
	return (error);			return (error);

	sc->asic_offset = ED_3COM_ASIC_OFFSET;			sc->asic_offset = ED_3COM_ASIC_OFFSET;
	sc->nic_offset = ED_3COM_NIC_OFFSET;			sc->nic_offset = ED_3COM_NIC_OFFSET;

	/*			/*
	* Verify that the kernel configured I/O address matches the board			* Verify that the kernel configured I/O address matches the board
	* configured address			* configured address
	▲ Show 20 Lines • Show All 284 Lines • Show Last 20 Lines