| firewire.c (190792) | firewire.c (193066) |
|---|---|
| 1/*- 2 * Copyright (c) 2003 Hidetoshi Shimokawa 3 * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 17 unchanged lines hidden (view full) --- 26 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 27 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 30 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 31 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 32 * POSSIBILITY OF SUCH DAMAGE. 33 * | 1/*- 2 * Copyright (c) 2003 Hidetoshi Shimokawa 3 * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 17 unchanged lines hidden (view full) --- 26 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 27 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 30 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 31 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 32 * POSSIBILITY OF SUCH DAMAGE. 33 * |
| 34 * $FreeBSD: head/sys/dev/firewire/firewire.c 190792 2009-04-07 02:33:46Z sbruno $ | 34 * $FreeBSD: head/sys/dev/firewire/firewire.c 193066 2009-05-29 21:27:12Z jamie $ |
| 35 * 36 */ 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/types.h> 41 | 35 * 36 */ 37 38#include <sys/param.h> 39#include <sys/systm.h> 40#include <sys/types.h> 41 |
| 42#include <sys/jail.h> |
|
| 42#include <sys/kernel.h> 43#include <sys/module.h> 44#include <sys/malloc.h> 45#include <sys/conf.h> 46#include <sys/sysctl.h> 47#include <sys/kthread.h> | 43#include <sys/kernel.h> 44#include <sys/module.h> 45#include <sys/malloc.h> 46#include <sys/conf.h> 47#include <sys/sysctl.h> 48#include <sys/kthread.h> |
| 48#include <sys/vimage.h> | |
| 49 50#include <sys/kdb.h> 51 52#if defined(__DragonFly__) || __FreeBSD_version < 500000 53#include <machine/clock.h> /* for DELAY() */ 54#endif 55 56#include <sys/bus.h> /* used by smbus and newbus */ --- 661 unchanged lines hidden (view full) --- 718 crom_add_entry(root, CSRKEY_VENDOR, CSRVAL_VENDOR_PRIVATE); 719#ifdef __DragonFly__ 720 crom_add_simple_text(src, root, &buf->vendor, "DragonFly Project"); 721 crom_add_entry(root, CSRKEY_HW, __DragonFly_cc_version); 722#else 723 crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project"); 724 crom_add_entry(root, CSRKEY_HW, __FreeBSD_version); 725#endif | 49 50#include <sys/kdb.h> 51 52#if defined(__DragonFly__) || __FreeBSD_version < 500000 53#include <machine/clock.h> /* for DELAY() */ 54#endif 55 56#include <sys/bus.h> /* used by smbus and newbus */ --- 661 unchanged lines hidden (view full) --- 718 crom_add_entry(root, CSRKEY_VENDOR, CSRVAL_VENDOR_PRIVATE); 719#ifdef __DragonFly__ 720 crom_add_simple_text(src, root, &buf->vendor, "DragonFly Project"); 721 crom_add_entry(root, CSRKEY_HW, __DragonFly_cc_version); 722#else 723 crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project"); 724 crom_add_entry(root, CSRKEY_HW, __FreeBSD_version); 725#endif |
| 726 crom_add_simple_text(src, root, &buf->hw, G_hostname); | 726 mtx_lock(&prison0.pr_mtx); 727 crom_add_simple_text(src, root, &buf->hw, prison0.pr_host); 728 mtx_unlock(&prison0.pr_mtx); |
| 727} 728 729/* 730 * Called after bus reset. 731 */ 732void 733fw_busreset(struct firewire_comm *fc, uint32_t new_status) 734{ --- 1698 unchanged lines hidden --- | 729} 730 731/* 732 * Called after bus reset. 733 */ 734void 735fw_busreset(struct firewire_comm *fc, uint32_t new_status) 736{ --- 1698 unchanged lines hidden --- |