From nobody Tue Jan 24 22:13:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1h7b5kBkz3bgGh; Tue, 24 Jan 2023 22:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h7b3Q1sz3H7x; Tue, 24 Jan 2023 22:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UAHwOBF0RHO4Y7juqZ7pI4bFB1s0QP6Y437nIM3c/1I=; b=dXc+GNY2v/AyOSbaOWNy47bRcc7hkHWWSgzi449it1LaNPIMZGuG/Kz/Dnk+B3RBGo4X1h bTHWTC76CI3qdeDbOKuPvoP4tUQkfdTQIssJ/suBYl8bZx3WvS26rAcLIrhuYJ3urxNP20 888BlItBRRJPzi8tbpW6TJV3rpYSKypVY1qRAs1GPeU8BzGo4ZZB44WLFslL/a5gPO29BU jcX1w86Y0cT+J2bTs13at3q3v3TjOXIn5tWOC8TaulDbI4TDK0ASBrKHKMo0gszP+/heDa dEJRUJ63vNbQxjBRltitao5RNAKxdtthnnQ5S699czHLbYZ3BK6XQO2jw3gpnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UAHwOBF0RHO4Y7juqZ7pI4bFB1s0QP6Y437nIM3c/1I=; b=FYBj8njUiFdyIUH4UpydT33qjFlD1N3+idFlmSUoEKpzNZBO6ZiHWBNAObXF6rWFojoyan TIcMHcA4hxzWIxE7JpQhJHO95wYWVCNXn/XffhP0WP8G3LIeoRJd4By0EeA8M2rQTkG0KL 6YYDIAjoxBT7Vbnfb4GHnt82KctsOSy04QE+jpNd6gdl7KRIDLuH5iEuSqdgilBMJ6p8wq 84REM7SvZEOXn1Q8MjXYQd9J5+wzi6Hcw0EKOo9JG0c/tZ0+MXnuIl0SVST1wIPrvjwynn zwoi+ckVBm5nOz8OlzqZ1KZsliHOoQQns0dSkeydbDJTZZxFxYpL+vp6CagAVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598411; a=rsa-sha256; cv=none; b=Z1yPF6PTUaBsllEZZVVh1lkei2e/QOcJ99gX6FAT4fge0hl+T7Zz7WagI6qIWVJ1YImVMK y5SrdY6lwVZ9Qe6tlwGjo3vh4iEyyt1y3IvjMGXHev++xlc56aThl1I6AkW1dWGZG46koA aVjzhJvO7WcKXVgal9lhq1EqNgMIzS8GcjS2N/ySR567L333i1Bf+uD3gj8/cPEADFr2ff eUBPX4wUOAfA3Oj2NCom5L1WvofC8ARMJD7QWFIcYPiBhlqn48XlLwXW1oRd6XhTdopHwh xyPo4zIGQeHdtQ37Ohzigq8iAXwc2q96geiJjRQ8YkAkl12iYw9FMA+k3LUPUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h7b2WTDzQVs; Tue, 24 Jan 2023 22:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMDVNG088540; Tue, 24 Jan 2023 22:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDVDi088539; Tue, 24 Jan 2023 22:13:31 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:31 GMT Message-Id: <202301242213.30OMDVDi088539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 6cb83949f7dd - stable/13 - stand/ofw: Use devparse List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6cb83949f7dd65d12e0baa5ee657ec8ebfc3233f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb83949f7dd65d12e0baa5ee657ec8ebfc3233f commit 6cb83949f7dd65d12e0baa5ee657ec8ebfc3233f Author: Warner Losh AuthorDate: 2022-11-30 22:10:18 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:40 +0000 stand/ofw: Use devparse Retire the custom parsedev routine and use the standard devparse. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37559 (cherry picked from commit 854001759e59172a2760d3a77f37a287f92053b3) --- stand/libofw/devicename.c | 93 ++++++----------------------------------------- 1 file changed, 12 insertions(+), 81 deletions(-) diff --git a/stand/libofw/devicename.c b/stand/libofw/devicename.c index 6ed2343ee7bd..7d488608c3f8 100644 --- a/stand/libofw/devicename.c +++ b/stand/libofw/devicename.c @@ -32,9 +32,7 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "libofw.h" -static int ofw_parsedev(struct ofw_devdesc **, const char *, const char **); - -/* +/* * Point (dev) at an allocated device specifier for the device matching the * path in (devspec). If it contains an explicit device specification, * use that. If not, use the default device. @@ -42,24 +40,24 @@ static int ofw_parsedev(struct ofw_devdesc **, const char *, const char **); int ofw_getdev(void **vdev, const char *devspec, const char **path) { - struct ofw_devdesc **dev = (struct ofw_devdesc **)vdev; + struct devdesc **dev = (struct devdesc **)vdev; int rv; /* - * If it looks like this is just a path and no device, go with the current - * device. + * If it looks like this is just a path and no device, go with the + * current device. */ if (devspec == NULL || strpbrk(devspec, ":@") == NULL) { - if (((rv = ofw_parsedev(dev, getenv("currdev"), NULL)) == 0) && - (path != NULL)) + rv = devparse(dev, getenv("currdev"), NULL); + if (rv == 0 && path != NULL) *path = devspec; - return(rv); + return (rv); } - + /* * Try to parse the device name off the beginning of the devspec */ - return(ofw_parsedev(dev, devspec, path)); + return (devparse(dev, devspec, path)); } /* @@ -94,80 +92,13 @@ ofw_path_to_handle(const char *ofwpath, const char *want_type, const char **path return ((phandle_t)-1); } -/* - * Point (dev) at an allocated device specifier matching the string version - * at the beginning of (devspec). Return a pointer to the remaining - * text in (path). - */ -static int -ofw_parsedev(struct ofw_devdesc **dev, const char *devspec, const char **path) -{ - struct ofw_devdesc *idev; - struct devsw *dv; - phandle_t handle; - const char *p; - const char *s; - char *ep; - char name[256]; - char type[64]; - int err; - int len; - int i; - - /* XXX next step: use devparse -- don't forget to hack ofw_disk like you did ofw_net */ - for (p = s = devspec; *s != '\0'; p = s) { - if ((s = strchr(p + 1, '/')) == NULL) - s = strchr(p, '\0'); - len = s - devspec; - bcopy(devspec, name, len); - name[len] = '\0'; - if ((handle = OF_finddevice(name)) == -1) { - bcopy(name, type, len); - type[len] = '\0'; - } else if (OF_getprop(handle, "device_type", type, sizeof(type)) == -1) - continue; - for (i = 0; (dv = devsw[i]) != NULL; i++) { - if (strncmp(dv->dv_name, type, strlen(dv->dv_name)) == 0) - goto found; - } - } - return(ENOENT); - -found: - if (path != NULL) - *path = s; - idev = malloc(sizeof(struct ofw_devdesc)); - if (idev == NULL) { - printf("ofw_parsedev: malloc failed\n"); - return ENOMEM; - } - idev->dd.d_dev = dv; - if (dv->dv_parsedev != NULL) { - p = devspec + strlen(dv->dv_name); - free(idev); - err = dv->dv_parsedev((struct devdesc **)&idev, devspec, path); - if (err != 0) { - return (err); - } - } else { - strcpy(idev->d_path, name); - } - - if (dev == NULL) { - free(idev); - } else { - *dev = idev; - } - return(0); -} - int ofw_setcurrdev(struct env_var *ev, int flags, const void *value) { - struct ofw_devdesc *ncurr; - int rv; + struct devdesc *ncurr; + int rv; - if ((rv = ofw_parsedev(&ncurr, value, NULL)) != 0) + if ((rv = devparse(&ncurr, value, NULL)) != 0) return (rv); free(ncurr);