Page MenuHomeFreeBSD
Files F97339900

D37560.diff
No OneTemporary
Actions

D37560.diff
View Options

diff --git a/stand/libofw/devicename.c b/stand/libofw/devicename.c
--- a/stand/libofw/devicename.c
+++ b/stand/libofw/devicename.c
@@ -105,3 +105,26 @@
return (mount_currdev(ev, flags, value));
}
+
+int
+ofw_common_parsedev(struct devdesc **dev, const char *devspec, const char **path,
+ const char *ofwtype)
+{
+ const char *rem_path;
+ struct ofw_devdesc *idev;
+
+ if (ofw_path_to_handle(devspec, ofwtype, &rem_path) == -1)
+ return (ENOENT);
+ idev = malloc(sizeof(struct ofw_devdesc));
+ if (idev == NULL) {
+ printf("ofw_parsedev: malloc failed\n");
+ return ENOMEM;
+ };
+ strlcpy(idev->d_path, devspec, min(rem_path - devspec + 1,
+ sizeof(idev->d_path)));
+ if (dev != NULL)
+ *dev = &idev->dd;
+ if (path != NULL)
+ *path = rem_path;
+ return 0;
+}
diff --git a/stand/libofw/libofw.h b/stand/libofw/libofw.h
--- a/stand/libofw/libofw.h
+++ b/stand/libofw/libofw.h
@@ -63,6 +63,8 @@
void ofw_memmap(int);
phandle_t ofw_path_to_handle(const char *ofwpath, const char *want_type, const char **path);
+int ofw_common_parsedev(struct devdesc **dev, const char *devspec, const char **path,
+ const char *ofwtype);
struct preloaded_file;
struct file_format;
diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c
--- a/stand/libofw/ofw_disk.c
+++ b/stand/libofw/ofw_disk.c
@@ -234,21 +234,5 @@
static int
ofwd_parsedev(struct devdesc **dev, const char *devspec, const char **path)
{
- const char *rem_path;
- struct ofw_devdesc *idev;
-
- if (ofw_path_to_handle(devspec, ofwdisk.dv_name, &rem_path) == -1)
- return (ENOENT);
- idev = malloc(sizeof(struct ofw_devdesc));
- if (idev == NULL) {
- printf("ofw_parsedev: malloc failed\n");
- return ENOMEM;
- };
- strlcpy(idev->d_path, devspec, min(rem_path - devspec + 1,
- sizeof(idev->d_path)));
- if (dev != NULL)
- *dev = &idev->dd;
- if (path != NULL)
- *path = rem_path;
- return 0;
+ return (ofw_common_parsedev(dev, devspec, path, ofwdisk.dv_name));
}
diff --git a/stand/libofw/ofw_net.c b/stand/libofw/ofw_net.c
--- a/stand/libofw/ofw_net.c
+++ b/stand/libofw/ofw_net.c
@@ -308,23 +308,7 @@
static int
ofwnd_parsedev(struct devdesc **dev, const char *devspec, const char **path)
{
- const char *rem_path;
- struct ofw_devdesc *idev;
-
- if (ofw_path_to_handle(devspec, ofw_netdev.dv_name, &rem_path) == -1)
- return (ENOENT);
- idev = malloc(sizeof(struct ofw_devdesc));
- if (idev == NULL) {
- printf("ofw_parsedev: malloc failed\n");
- return ENOMEM;
- };
- strlcpy(idev->d_path, devspec, min(rem_path - devspec + 1,
- sizeof(idev->d_path)));
- if (dev != NULL)
- *dev = &idev->dd;
- if (path != NULL)
- *path = rem_path;
- return 0;
+ return (ofw_common_parsedev(dev, devspec, path, ofw_netdev.dv_name));
}
static bool

File Metadata

Mime Type
text/plain
Expires
Sun, Sep 29, 6:15 PM (40 m, 54 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13090256
Default Alt Text
D37560.diff (2 KB)

Event Timeline