| etherswitch.c (235288) | etherswitch.c (241578) |
|---|---|
| 1/*- 2 * Copyright (c) 2011-2012 Stefan Bethke. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * | 1/*- 2 * Copyright (c) 2011-2012 Stefan Bethke. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * |
| 26 * $FreeBSD: head/sys/dev/etherswitch/etherswitch.c 235288 2012-05-11 20:53:20Z adrian $ | 26 * $FreeBSD: head/sys/dev/etherswitch/etherswitch.c 241578 2012-10-15 12:20:40Z ray $ |
| 27 */ 28 29#include <sys/param.h> 30#include <sys/bus.h> 31#include <sys/conf.h> 32#include <sys/fcntl.h> 33#include <sys/lock.h> 34#include <sys/kernel.h> --- 173 unchanged lines hidden (view full) --- 208 switch (cmd) { 209 case IOETHERSWITCHGETINFO: 210 info = ETHERSWITCH_GETINFO(etherswitch); 211 bcopy(info, data, sizeof(etherswitch_info_t)); 212 break; 213 214 case IOETHERSWITCHGETREG: 215 reg = (etherswitch_reg_t *)data; | 27 */ 28 29#include <sys/param.h> 30#include <sys/bus.h> 31#include <sys/conf.h> 32#include <sys/fcntl.h> 33#include <sys/lock.h> 34#include <sys/kernel.h> --- 173 unchanged lines hidden (view full) --- 208 switch (cmd) { 209 case IOETHERSWITCHGETINFO: 210 info = ETHERSWITCH_GETINFO(etherswitch); 211 bcopy(info, data, sizeof(etherswitch_info_t)); 212 break; 213 214 case IOETHERSWITCHGETREG: 215 reg = (etherswitch_reg_t *)data; |
| 216 ETHERSWITCH_LOCK(etherswitch); |
|
| 216 reg->val = ETHERSWITCH_READREG(etherswitch, reg->reg); | 217 reg->val = ETHERSWITCH_READREG(etherswitch, reg->reg); |
| 218 ETHERSWITCH_UNLOCK(etherswitch); |
|
| 217 break; 218 219 case IOETHERSWITCHSETREG: 220 reg = (etherswitch_reg_t *)data; | 219 break; 220 221 case IOETHERSWITCHSETREG: 222 reg = (etherswitch_reg_t *)data; |
| 223 ETHERSWITCH_LOCK(etherswitch); |
|
| 221 error = ETHERSWITCH_WRITEREG(etherswitch, reg->reg, reg->val); | 224 error = ETHERSWITCH_WRITEREG(etherswitch, reg->reg, reg->val); |
| 225 ETHERSWITCH_UNLOCK(etherswitch); |
|
| 222 break; 223 224 case IOETHERSWITCHGETPORT: 225 error = ETHERSWITCH_GETPORT(etherswitch, (etherswitch_port_t *)data); 226 break; 227 228 case IOETHERSWITCHSETPORT: 229 error = ETHERSWITCH_SETPORT(etherswitch, (etherswitch_port_t *)data); --- 28 unchanged lines hidden --- | 226 break; 227 228 case IOETHERSWITCHGETPORT: 229 error = ETHERSWITCH_GETPORT(etherswitch, (etherswitch_port_t *)data); 230 break; 231 232 case IOETHERSWITCHSETPORT: 233 error = ETHERSWITCH_SETPORT(etherswitch, (etherswitch_port_t *)data); --- 28 unchanged lines hidden --- |