freebsd compat. layer: implemented miibus_readreg and miibus_writereg, it goes up through the tree until the driver.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21095 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/libs/compat/freebsd_network/compat/dev/mii/miivar.h

@@ -189,6 +189,15 @@ struct mii_media {
 
 #ifdef _KERNEL
 
+int miibus_readreg(device_t dev, int phy, int reg);
+int miibus_writereg(device_t dev, int phy, int reg, int data);
+
+#define MIIBUS_READREG(dev, phy, reg) \
+	miibus_readreg((dev), (phy), (reg))
+
+#define MIIBUS_WRITEREG(dev, phy, reg, value) \
+	miibus_writereg((dev), (phy), (reg), (value))
+
 #define PHY_READ(p, r) \
 	MIIBUS_READREG((p)->mii_dev, (p)->mii_phy, (r))
 

src/libs/compat/freebsd_network/device.c

@@ -30,19 +30,39 @@ struct network_device *gDevices[MAX_DEVICES];
 const char *gDevNameList[MAX_DEVICES + 1];
 
 
-static device_probe_t  *sDeviceProbe;
-static device_attach_t *sDeviceAttach;
-static device_detach_t *sDeviceDetach;
-
-
 static device_t
 init_device(device_t dev, driver_t *driver)
 {
+	device_method_signature_t method = NULL;
+	int i;
+
 	dev->driver = driver;
 	dev->softc = malloc(driver->softc_size);
 	if (dev->softc == NULL)
 		return NULL;
 
+	for (i = 0; method == NULL && driver->methods[i].name != NULL; i++) {
+		device_method_t *mth = &driver->methods[i];
+		if (strcmp(mth->name, "device_probe") == 0)
+			dev->methods.probe = (void *)mth->method;
+		else if (strcmp(mth->name, "device_attach") == 0)
+			dev->methods.attach = (void *)mth->method;
+		else if (strcmp(mth->name, "device_detach") == 0)
+			dev->methods.detach = (void *)mth->method;
+		else if (strcmp(mth->name, "device_suspend") == 0)
+			dev->methods.suspend = (void *)mth->method;
+		else if (strcmp(mth->name, "device_resume") == 0)
+			dev->methods.resume = (void *)mth->method;
+		else if (strcmp(mth->name, "device_shutdown") == 0)
+			dev->methods.shutdown = (void *)mth->method;
+		else if (strcmp(mth->name, "miibus_readreg") == 0)
+			dev->methods.miibus_readreg = (void *)mth->method;
+		else if (strcmp(mth->name, "miibus_writereg") == 0)
+			dev->methods.miibus_writereg = (void *)mth->method;
+		else if (strcmp(mth->name, "miibus_statchg") == 0)
+			dev->methods.miibus_statchg = (void *)mth->method;
+	}
+
 	return dev;
 }
 
@@ -143,7 +163,7 @@ compat_open(const char *name, uint32 flags, void **cookie)
 	/* some drivers expect the softc to be zero'ed out */
 	memset(dev->base.softc, 0, dev->base.driver->softc_size);
 
-	status = sDeviceAttach(DEVNET(dev));
+	status = DEVNET(dev)->methods.attach(DEVNET(dev));
 	if (status != 0)
 		atomic_and(&dev->open, 0);
 
@@ -194,7 +214,7 @@ compat_free(void *cookie)
 
 	device_printf(DEVNET(dev), "compat_free()\n");
 
-	sDeviceDetach(DEVNET(dev));
+	DEVNET(dev)->methods.detach(DEVNET(dev));
 
 	/* XXX empty out the send queue */
 
@@ -447,10 +467,6 @@ _fbsd_init_driver(driver_t *driver)
 		return status;
 	}
 
-	sDeviceProbe  = (device_probe_t  *)_resolve_method(driver, "device_probe");
-	sDeviceAttach = (device_attach_t *)_resolve_method(driver, "device_attach");
-	sDeviceDetach = (device_detach_t *)_resolve_method(driver, "device_detach");
-
 	dev = allocate_device(driver);
 	if (dev == NULL)
 		goto err_1;
@@ -479,7 +495,7 @@ _fbsd_init_driver(driver_t *driver)
 			&& gPci->get_nth_pci_info(i, &dev->pci_info) == B_OK; i++) {
 		device_t base = DEVNET(dev);
 
-		if (sDeviceProbe(base) >= 0) {
+		if (base->methods.probe(base) >= 0) {
 			device_sprintf_name(base, "net/%s/%i", gDriverName, ncards);
 			dprintf("%s, adding %s @%d -> /dev/%s\n", gDriverName,
 				device_get_desc(base), i, device_get_name(base));

src/libs/compat/freebsd_network/device.h

@@ -25,6 +25,7 @@
 struct ifnet;
 
 struct device {
+	struct device * parent;
 	char			dev_name[128];
 
 	driver_t		*driver;
@@ -35,6 +36,19 @@ struct device {
 	char			nameunit[64];
 	const char *	description;
 	void *			softc;
+
+	struct {
+		int (*probe)(device_t dev);
+		int (*attach)(device_t dev);
+		int (*detach)(device_t dev);
+		int (*suspend)(device_t dev);
+		int (*resume)(device_t dev);
+		void (*shutdown)(device_t dev);
+
+		int (*miibus_readreg)(device_t, int, int);
+		int (*miibus_writereg)(device_t, int, int, int);
+		void (*miibus_statchg)(device_t);
+	} methods;
 };
 
 

src/libs/compat/freebsd_network/mii.c

@@ -20,7 +20,33 @@ driver_t miibus_driver = {
 
 
 int
-mii_phy_probe(device_t dev, device_t *miiDev, ifm_change_cb_t change,
+miibus_readreg(device_t dev, int phy, int reg)
+{
+	if (dev->methods.miibus_readreg == NULL) {
+		if (dev->parent == NULL)
+			panic("miibus_readreg, no support");
+		return miibus_readreg(dev->parent, phy, reg);
+	}
+
+	return dev->methods.miibus_readreg(dev, phy, reg);
+}
+
+
+int
+miibus_writereg(device_t dev, int phy, int reg, int data)
+{
+	if (dev->methods.miibus_writereg == NULL) {
+		if (dev->parent == NULL)
+			panic("miibus_writereg, no support");
+		return miibus_writereg(dev->parent, phy, reg, data);
+	}
+
+	return dev->methods.miibus_writereg(dev, phy, reg, data);
+}
+
+
+int
+mii_phy_probe(device_t dev, device_t *mii_dev, ifm_change_cb_t change,
 	ifm_stat_cb_t stat)
 {
 	UNIMPLEMENTED();