From owner-svn-src-all@FreeBSD.ORG Sat Apr 18 07:34:40 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 651D8FB1; Sat, 18 Apr 2015 07:34:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 524C681A; Sat, 18 Apr 2015 07:34:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3I7Yer5050877; Sat, 18 Apr 2015 07:34:40 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3I7Yel5050876; Sat, 18 Apr 2015 07:34:40 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201504180734.t3I7Yel5050876@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Sat, 18 Apr 2015 07:34:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281686 - head/sys/dev/etherswitch X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2015 07:34:40 -0000 Author: rpaulo Date: Sat Apr 18 07:34:39 2015 New Revision: 281686 URL: https://svnweb.freebsd.org/changeset/base/281686 Log: Fix French typos in etherswitch. Modified: head/sys/dev/etherswitch/miiproxy.c Modified: head/sys/dev/etherswitch/miiproxy.c ============================================================================== --- head/sys/dev/etherswitch/miiproxy.c Sat Apr 18 06:53:13 2015 (r281685) +++ head/sys/dev/etherswitch/miiproxy.c Sat Apr 18 07:34:39 2015 (r281686) @@ -62,35 +62,35 @@ struct mdioproxy_softc { }; /* - * The rendevous data structures and functions allow two device endpoints to + * The rendezvous data structures and functions allow two device endpoints to * match up, so that the proxy endpoint can be associated with a target * endpoint. The proxy has to know the device name of the target that it - * wants to associate with, for example through a hint. The rendevous code + * wants to associate with, for example through a hint. The rendezvous code * makes no assumptions about the devices that want to meet. */ -struct rendevous_entry; +struct rendezvous_entry; -enum rendevous_op { - RENDEVOUS_ATTACH, - RENDEVOUS_DETACH +enum rendezvous_op { + RENDEZVOUS_ATTACH, + RENDEZVOUS_DETACH }; -typedef int (*rendevous_callback_t)(enum rendevous_op, - struct rendevous_entry *); +typedef int (*rendezvous_callback_t)(enum rendezvous_op, + struct rendezvous_entry *); -static SLIST_HEAD(rendevoushead, rendevous_entry) rendevoushead = - SLIST_HEAD_INITIALIZER(rendevoushead); +static SLIST_HEAD(rendezvoushead, rendezvous_entry) rendezvoushead = + SLIST_HEAD_INITIALIZER(rendezvoushead); -struct rendevous_endpoint { +struct rendezvous_endpoint { device_t device; const char *name; - rendevous_callback_t callback; + rendezvous_callback_t callback; }; -struct rendevous_entry { - SLIST_ENTRY(rendevous_entry) entries; - struct rendevous_endpoint proxy; - struct rendevous_endpoint target; +struct rendezvous_entry { + SLIST_ENTRY(rendezvous_entry) entries; + struct rendezvous_endpoint proxy; + struct rendezvous_endpoint target; }; /* @@ -98,15 +98,15 @@ struct rendevous_entry { * returns an error, undo the attachment. */ static int -rendevous_attach(struct rendevous_entry *e, struct rendevous_endpoint *ep) +rendezvous_attach(struct rendezvous_entry *e, struct rendezvous_endpoint *ep) { int error; - error = e->proxy.callback(RENDEVOUS_ATTACH, e); + error = e->proxy.callback(RENDEZVOUS_ATTACH, e); if (error == 0) { - error = e->target.callback(RENDEVOUS_ATTACH, e); + error = e->target.callback(RENDEZVOUS_ATTACH, e); if (error != 0) { - e->proxy.callback(RENDEVOUS_DETACH, e); + e->proxy.callback(RENDEZVOUS_DETACH, e); ep->device = NULL; ep->callback = NULL; } @@ -115,27 +115,27 @@ rendevous_attach(struct rendevous_entry } /* - * Create an entry for the proxy in the rendevous list. The name parameter + * Create an entry for the proxy in the rendezvous list. The name parameter * indicates the name of the device that is the target endpoint for this - * rendevous. The callback will be invoked as soon as the target is + * rendezvous. The callback will be invoked as soon as the target is * registered: either immediately if the target registered itself earlier, * or once the target registers. Returns ENXIO if the target has not yet * registered. */ static int -rendevous_register_proxy(device_t dev, const char *name, - rendevous_callback_t callback) +rendezvous_register_proxy(device_t dev, const char *name, + rendezvous_callback_t callback) { - struct rendevous_entry *e; + struct rendezvous_entry *e; KASSERT(callback != NULL, ("callback must be set")); - SLIST_FOREACH(e, &rendevoushead, entries) { + SLIST_FOREACH(e, &rendezvoushead, entries) { if (strcmp(name, e->target.name) == 0) { /* the target is already attached */ e->proxy.name = device_get_nameunit(dev); e->proxy.device = dev; e->proxy.callback = callback; - return (rendevous_attach(e, &e->proxy)); + return (rendezvous_attach(e, &e->proxy)); } } e = malloc(sizeof(*e), M_MIIPROXY, M_WAITOK | M_ZERO); @@ -143,34 +143,34 @@ rendevous_register_proxy(device_t dev, c e->proxy.device = dev; e->proxy.callback = callback; e->target.name = name; - SLIST_INSERT_HEAD(&rendevoushead, e, entries); + SLIST_INSERT_HEAD(&rendezvoushead, e, entries); return (ENXIO); } /* - * Create an entry in the rendevous list for the target. + * Create an entry in the rendezvous list for the target. * Returns ENXIO if the proxy has not yet registered. */ static int -rendevous_register_target(device_t dev, rendevous_callback_t callback) +rendezvous_register_target(device_t dev, rendezvous_callback_t callback) { - struct rendevous_entry *e; + struct rendezvous_entry *e; const char *name; - + KASSERT(callback != NULL, ("callback must be set")); name = device_get_nameunit(dev); - SLIST_FOREACH(e, &rendevoushead, entries) { + SLIST_FOREACH(e, &rendezvoushead, entries) { if (strcmp(name, e->target.name) == 0) { e->target.device = dev; e->target.callback = callback; - return (rendevous_attach(e, &e->target)); + return (rendezvous_attach(e, &e->target)); } } e = malloc(sizeof(*e), M_MIIPROXY, M_WAITOK | M_ZERO); e->target.name = name; e->target.device = dev; e->target.callback = callback; - SLIST_INSERT_HEAD(&rendevoushead, e, entries); + SLIST_INSERT_HEAD(&rendezvoushead, e, entries); return (ENXIO); } @@ -178,20 +178,20 @@ rendevous_register_target(device_t dev, * Remove the registration for the proxy. */ static int -rendevous_unregister_proxy(device_t dev) +rendezvous_unregister_proxy(device_t dev) { - struct rendevous_entry *e; + struct rendezvous_entry *e; int error = 0; - - SLIST_FOREACH(e, &rendevoushead, entries) { + + SLIST_FOREACH(e, &rendezvoushead, entries) { if (e->proxy.device == dev) { if (e->target.device == NULL) { - SLIST_REMOVE(&rendevoushead, e, rendevous_entry, entries); + SLIST_REMOVE(&rendezvoushead, e, rendezvous_entry, entries); free(e, M_MIIPROXY); return (0); } else { - e->proxy.callback(RENDEVOUS_DETACH, e); - e->target.callback(RENDEVOUS_DETACH, e); + e->proxy.callback(RENDEZVOUS_DETACH, e); + e->target.callback(RENDEZVOUS_DETACH, e); } e->proxy.device = NULL; e->proxy.callback = NULL; @@ -205,20 +205,20 @@ rendevous_unregister_proxy(device_t dev) * Remove the registration for the target. */ static int -rendevous_unregister_target(device_t dev) +rendezvous_unregister_target(device_t dev) { - struct rendevous_entry *e; + struct rendezvous_entry *e; int error = 0; - - SLIST_FOREACH(e, &rendevoushead, entries) { + + SLIST_FOREACH(e, &rendezvoushead, entries) { if (e->target.device == dev) { if (e->proxy.device == NULL) { - SLIST_REMOVE(&rendevoushead, e, rendevous_entry, entries); + SLIST_REMOVE(&rendezvoushead, e, rendezvous_entry, entries); free(e, M_MIIPROXY); return (0); } else { - e->proxy.callback(RENDEVOUS_DETACH, e); - e->target.callback(RENDEVOUS_DETACH, e); + e->proxy.callback(RENDEZVOUS_DETACH, e); + e->target.callback(RENDEZVOUS_DETACH, e); } e->target.device = NULL; e->target.callback = NULL; @@ -234,15 +234,15 @@ rendevous_unregister_target(device_t dev */ static int -miiproxy_rendevous_callback(enum rendevous_op op, struct rendevous_entry *rendevous) +miiproxy_rendezvous_callback(enum rendezvous_op op, struct rendezvous_entry *rendezvous) { - struct miiproxy_softc *sc = device_get_softc(rendevous->proxy.device); + struct miiproxy_softc *sc = device_get_softc(rendezvous->proxy.device); switch (op) { - case RENDEVOUS_ATTACH: - sc->mdio = device_get_parent(rendevous->target.device); + case RENDEZVOUS_ATTACH: + sc->mdio = device_get_parent(rendezvous->target.device); break; - case RENDEVOUS_DETACH: + case RENDEZVOUS_DETACH: sc->mdio = NULL; break; } @@ -263,7 +263,7 @@ miiproxy_attach(device_t dev) /* * The ethernet interface needs to call mii_attach_proxy() to pass - * the relevant parameters for rendevous with the MDIO target. + * the relevant parameters for rendezvous with the MDIO target. */ return (bus_generic_attach(dev)); } @@ -272,7 +272,7 @@ static int miiproxy_detach(device_t dev) { - rendevous_unregister_proxy(dev); + rendezvous_unregister_proxy(dev); bus_generic_detach(dev); return (0); } @@ -322,7 +322,7 @@ miiproxy_mediainit(device_t dev) * Functions for the MDIO target device driver. */ static int -mdioproxy_rendevous_callback(enum rendevous_op op, struct rendevous_entry *rendevous) +mdioproxy_rendezvous_callback(enum rendezvous_op op, struct rendezvous_entry *rendezvous) { return (0); } @@ -349,7 +349,7 @@ static int mdioproxy_attach(device_t dev) { - rendevous_register_target(dev, mdioproxy_rendevous_callback); + rendezvous_register_target(dev, mdioproxy_rendezvous_callback); return (bus_generic_attach(dev)); } @@ -357,7 +357,7 @@ static int mdioproxy_detach(device_t dev) { - rendevous_unregister_target(dev); + rendezvous_unregister_target(dev); bus_generic_detach(dev); return (0); } @@ -373,7 +373,7 @@ mii_attach_proxy(device_t dev) int error; const char *name; device_t miiproxy; - + if (resource_string_value(device_get_name(dev), device_get_unit(dev), "mdio", &name) != 0) { if (bootverbose) @@ -391,7 +391,7 @@ mii_attach_proxy(device_t dev) sc = device_get_softc(miiproxy); sc->parent = dev; sc->proxy = miiproxy; - if (rendevous_register_proxy(miiproxy, name, miiproxy_rendevous_callback) != 0) { + if (rendezvous_register_proxy(miiproxy, name, miiproxy_rendezvous_callback) != 0) { device_printf(dev, "can't attach proxy\n"); return (NULL); }