Skip to content

Commit e78483c

Browse files
author
Stefan Richter
committed
Merge firewire branches to be released post v2.6.35
Conflicts: drivers/firewire/core-card.c drivers/firewire/core-cdev.c and forgotten #include <linux/time.h> in drivers/firewire/ohci.c Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
3 parents 9fe6206 + b20d02e + 2080222 commit e78483c

31 files changed

+4303
-571
lines changed

‎Documentation/ioctl/ioctl-number.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ Code Seq#(hex) Include File Comments
7979
0x22 all scsi/sg.h
8080
'#' 00-3F IEEE 1394 Subsystem Block for the entire subsystem
8181
'$' 00-0F linux/perf_counter.h, linux/perf_event.h
82+
'&' 00-07 drivers/firewire/nosy-user.h
8283
'1' 00-1F <linux/timepps.h> PPS kit from Ulrich Windl
8384
<ftp://ftp.de.kernel.org/pub/linux/daemons/ntp/PPS/>
8485
'2' 01-04 linux/i2o.h

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,6 +2307,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
23072307
S: Maintained
23082308
F: drivers/firewire/
23092309
F: include/linux/firewire*.h
2310+
F: tools/firewire/
23102311

23112312
FIRMWARE LOADER (request_firmware)
23122313
S: Orphan

‎drivers/firewire/Kconfig

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,28 @@ config FIREWIRE_NET
6666

6767
source "drivers/ieee1394/Kconfig"
6868

69+
config FIREWIRE_NOSY
70+
tristate "Nosy - a FireWire traffic sniffer for PCILynx cards"
71+
depends on PCI
72+
help
73+
Nosy is an IEEE 1394 packet sniffer that is used for protocol
74+
analysis and in development of IEEE 1394 drivers, applications,
75+
or firmwares.
76+
77+
This driver lets you use a Texas Instruments PCILynx 1394 to PCI
78+
link layer controller TSB12LV21/A/B as a low-budget bus analyzer.
79+
PCILynx is a nowadays very rare IEEE 1394 controller which is
80+
not OHCI 1394 compliant.
81+
82+
The following cards are known to be based on PCILynx or PCILynx-2:
83+
IOI IOI-1394TT (PCI card), Unibrain Fireboard 400 PCI Lynx-2
84+
(PCI card), Newer Technology FireWire 2 Go (CardBus card),
85+
Apple Power Mac G3 blue & white (onboard controller).
86+
87+
To compile this driver as a module, say M here: The module will be
88+
called nosy. Source code of a userspace interface to nosy, called
89+
nosy-dump, can be found in tools/firewire/ of the kernel sources.
90+
91+
If unsure, say N.
92+
6993
endmenu

‎drivers/firewire/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ obj-$(CONFIG_FIREWIRE) += firewire-core.o
1212
obj-$(CONFIG_FIREWIRE_OHCI) += firewire-ohci.o
1313
obj-$(CONFIG_FIREWIRE_SBP2) += firewire-sbp2.o
1414
obj-$(CONFIG_FIREWIRE_NET) += firewire-net.o
15+
obj-$(CONFIG_FIREWIRE_NOSY) += nosy.o

0 commit comments

Comments
 (0)