Commit b5e47729 authored by Stefan Richter's avatar Stefan Richter

firewire: nosy: misc cleanups

Extend copyright note to 2007, c.f. Kristian's git log.

Includes:
  - replace some <asm/*.h> by <linux/*.h>
  - add required indirectly included <linux/spinlock.h>
  - order alphabetically

Coding style related changes:
  - change to utf8
  - normalize whitespace
  - normalize comment style
  - remove usages of __FUNCTION__
  - remove an unnecessary cast from void *

Const and static declarations:
  - driver_name is not const in pci_driver.name, drop const qualifier
  - driver_name can be taken from KBUILD_MODNAME
  - the global variable minors[] can and should be static
  - constify struct file_operations instance

Data types:
  - Remove unused struct member struct packet.code.  struct packet is
    only used for driver-internal bookkeeping; it does not appear on the
    wire or in DMA programs or the userspace ABI.  Hence the unused
    member .code can be removed without worries.

Preprocessor macros:
  - unroll a preprocessor macro that containd a return
  - use list_for_each_entry

Printk:
  - add missing terminating \n in some format strings
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 28646821
#ifndef __nosy_user_h #ifndef __nosy_user_h
#define __nosy_user_h #define __nosy_user_h
#include <asm/ioctl.h> #include <linux/ioctl.h>
#include <asm/types.h> #include <linux/types.h>
#define NOSY_IOC_GET_STATS _IOR('&', 0, struct nosy_stats) #define NOSY_IOC_GET_STATS _IOR('&', 0, struct nosy_stats)
#define NOSY_IOC_START _IO('&', 1) #define NOSY_IOC_START _IO('&', 1)
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
#define NOSY_IOC_FILTER _IOW('&', 2, __u32) #define NOSY_IOC_FILTER _IOW('&', 2, __u32)
struct nosy_stats { struct nosy_stats {
__u32 total_packet_count; __u32 total_packet_count;
__u32 lost_packet_count; __u32 lost_packet_count;
}; };
/* /*
* Format of packets returned from the kernel driver: * Format of packets returned from the kernel driver:
* *
* quadlet with timestamp (microseconds) * quadlet with timestamp (microseconds)
......
This diff is collapsed.
/* Chip register definitions for PCILynx chipset. Based on pcilynx.h /*
* Chip register definitions for PCILynx chipset. Based on pcilynx.h
* from the Linux 1394 drivers, but modified a bit so the names here * from the Linux 1394 drivers, but modified a bit so the names here
* match the specification exactly (even though they have weird names, * match the specification exactly (even though they have weird names,
* like xxx_OVER_FLOW, or arbitrary abbreviations like SNTRJ for "sent * like xxx_OVER_FLOW, or arbitrary abbreviations like SNTRJ for "sent
...@@ -16,7 +17,7 @@ ...@@ -16,7 +17,7 @@
#define SERIAL_EEPROM_CONTROL 0x44 #define SERIAL_EEPROM_CONTROL 0x44
#define PCI_INT_STATUS 0x48 #define PCI_INT_STATUS 0x48
#define PCI_INT_ENABLE 0x4c #define PCI_INT_ENABLE 0x4c
/* status and enable have identical bit numbers */ /* status and enable have identical bit numbers */
#define PCI_INT_INT_PEND (1<<31) #define PCI_INT_INT_PEND (1<<31)
#define PCI_INT_FRC_INT (1<<30) #define PCI_INT_FRC_INT (1<<30)
...@@ -48,7 +49,7 @@ ...@@ -48,7 +49,7 @@
#define LBUS_ADDR_SEL_RAM (0x0<<16) #define LBUS_ADDR_SEL_RAM (0x0<<16)
#define LBUS_ADDR_SEL_ROM (0x1<<16) #define LBUS_ADDR_SEL_ROM (0x1<<16)
#define LBUS_ADDR_SEL_AUX (0x2<<16) #define LBUS_ADDR_SEL_AUX (0x2<<16)
#define LBUS_ADDR_SEL_ZV (0x3<<16) #define LBUS_ADDR_SEL_ZV (0x3<<16)
#define GPIO_CTRL_A 0xb8 #define GPIO_CTRL_A 0xb8
#define GPIO_CTRL_B 0xbc #define GPIO_CTRL_B 0xbc
...@@ -90,14 +91,14 @@ ...@@ -90,14 +91,14 @@
#define PCL_BIGENDIAN (1<<16) #define PCL_BIGENDIAN (1<<16)
#define PCL_ISOMODE (1<<12) #define PCL_ISOMODE (1<<12)
#define DMA0_PREV_PCL 0x100 #define DMA0_PREV_PCL 0x100
#define DMA1_PREV_PCL 0x120 #define DMA1_PREV_PCL 0x120
#define DMA2_PREV_PCL 0x140 #define DMA2_PREV_PCL 0x140
#define DMA3_PREV_PCL 0x160 #define DMA3_PREV_PCL 0x160
#define DMA4_PREV_PCL 0x180 #define DMA4_PREV_PCL 0x180
#define DMA_PREV_PCL(chan) (DMA_BREG(DMA0_PREV_PCL, chan)) #define DMA_PREV_PCL(chan) (DMA_BREG(DMA0_PREV_PCL, chan))
#define DMA0_CURRENT_PCL 0x104 #define DMA0_CURRENT_PCL 0x104
#define DMA1_CURRENT_PCL 0x124 #define DMA1_CURRENT_PCL 0x124
#define DMA2_CURRENT_PCL 0x144 #define DMA2_CURRENT_PCL 0x144
#define DMA3_CURRENT_PCL 0x164 #define DMA3_CURRENT_PCL 0x164
...@@ -118,15 +119,14 @@ ...@@ -118,15 +119,14 @@
#define DMA_CHAN_STAT_PKTCMPL (1<<27) #define DMA_CHAN_STAT_PKTCMPL (1<<27)
#define DMA_CHAN_STAT_SPECIALACK (1<<14) #define DMA_CHAN_STAT_SPECIALACK (1<<14)
#define DMA0_CHAN_CTRL 0x110
#define DMA0_CHAN_CTRL 0x110
#define DMA1_CHAN_CTRL 0x130 #define DMA1_CHAN_CTRL 0x130
#define DMA2_CHAN_CTRL 0x150 #define DMA2_CHAN_CTRL 0x150
#define DMA3_CHAN_CTRL 0x170 #define DMA3_CHAN_CTRL 0x170
#define DMA4_CHAN_CTRL 0x190 #define DMA4_CHAN_CTRL 0x190
#define DMA_CHAN_CTRL(chan) (DMA_BREG(DMA0_CHAN_CTRL, chan)) #define DMA_CHAN_CTRL(chan) (DMA_BREG(DMA0_CHAN_CTRL, chan))
/* CHAN_CTRL registers share bits */ /* CHAN_CTRL registers share bits */
#define DMA_CHAN_CTRL_ENABLE (1<<31) #define DMA_CHAN_CTRL_ENABLE (1<<31)
#define DMA_CHAN_CTRL_BUSY (1<<30) #define DMA_CHAN_CTRL_BUSY (1<<30)
#define DMA_CHAN_CTRL_LINK (1<<29) #define DMA_CHAN_CTRL_LINK (1<<29)
...@@ -153,28 +153,28 @@ ...@@ -153,28 +153,28 @@
#define DMA2_WORD0_CMP_VALUE 0xb20 #define DMA2_WORD0_CMP_VALUE 0xb20
#define DMA3_WORD0_CMP_VALUE 0xb30 #define DMA3_WORD0_CMP_VALUE 0xb30
#define DMA4_WORD0_CMP_VALUE 0xb40 #define DMA4_WORD0_CMP_VALUE 0xb40
#define DMA_WORD0_CMP_VALUE(chan) (DMA_SREG(DMA0_WORD0_CMP_VALUE, chan)) #define DMA_WORD0_CMP_VALUE(chan) (DMA_SREG(DMA0_WORD0_CMP_VALUE, chan))
#define DMA0_WORD0_CMP_ENABLE 0xb04 #define DMA0_WORD0_CMP_ENABLE 0xb04
#define DMA1_WORD0_CMP_ENABLE 0xb14 #define DMA1_WORD0_CMP_ENABLE 0xb14
#define DMA2_WORD0_CMP_ENABLE 0xb24 #define DMA2_WORD0_CMP_ENABLE 0xb24
#define DMA3_WORD0_CMP_ENABLE 0xb34 #define DMA3_WORD0_CMP_ENABLE 0xb34
#define DMA4_WORD0_CMP_ENABLE 0xb44 #define DMA4_WORD0_CMP_ENABLE 0xb44
#define DMA_WORD0_CMP_ENABLE(chan) (DMA_SREG(DMA0_WORD0_CMP_ENABLE,chan)) #define DMA_WORD0_CMP_ENABLE(chan) (DMA_SREG(DMA0_WORD0_CMP_ENABLE, chan))
#define DMA0_WORD1_CMP_VALUE 0xb08 #define DMA0_WORD1_CMP_VALUE 0xb08
#define DMA1_WORD1_CMP_VALUE 0xb18 #define DMA1_WORD1_CMP_VALUE 0xb18
#define DMA2_WORD1_CMP_VALUE 0xb28 #define DMA2_WORD1_CMP_VALUE 0xb28
#define DMA3_WORD1_CMP_VALUE 0xb38 #define DMA3_WORD1_CMP_VALUE 0xb38
#define DMA4_WORD1_CMP_VALUE 0xb48 #define DMA4_WORD1_CMP_VALUE 0xb48
#define DMA_WORD1_CMP_VALUE(chan) (DMA_SREG(DMA0_WORD1_CMP_VALUE, chan)) #define DMA_WORD1_CMP_VALUE(chan) (DMA_SREG(DMA0_WORD1_CMP_VALUE, chan))
#define DMA0_WORD1_CMP_ENABLE 0xb0c #define DMA0_WORD1_CMP_ENABLE 0xb0c
#define DMA1_WORD1_CMP_ENABLE 0xb1c #define DMA1_WORD1_CMP_ENABLE 0xb1c
#define DMA2_WORD1_CMP_ENABLE 0xb2c #define DMA2_WORD1_CMP_ENABLE 0xb2c
#define DMA3_WORD1_CMP_ENABLE 0xb3c #define DMA3_WORD1_CMP_ENABLE 0xb3c
#define DMA4_WORD1_CMP_ENABLE 0xb4c #define DMA4_WORD1_CMP_ENABLE 0xb4c
#define DMA_WORD1_CMP_ENABLE(chan) (DMA_SREG(DMA0_WORD1_CMP_ENABLE,chan)) #define DMA_WORD1_CMP_ENABLE(chan) (DMA_SREG(DMA0_WORD1_CMP_ENABLE, chan))
/* word 1 compare enable flags */ /* word 1 compare enable flags */
#define DMA_WORD1_CMP_MATCH_OTHERBUS (1<<15) #define DMA_WORD1_CMP_MATCH_OTHERBUS (1<<15)
#define DMA_WORD1_CMP_MATCH_BROADCAST (1<<14) #define DMA_WORD1_CMP_MATCH_BROADCAST (1<<14)
...@@ -211,7 +211,6 @@ ...@@ -211,7 +211,6 @@
#define LINK_PHY_WDATA(data) (data<<16) #define LINK_PHY_WDATA(data) (data<<16)
#define LINK_PHY_RADDR(addr) (addr<<8) #define LINK_PHY_RADDR(addr) (addr<<8)
#define LINK_INT_STATUS 0xf14 #define LINK_INT_STATUS 0xf14
#define LINK_INT_ENABLE 0xf18 #define LINK_INT_ENABLE 0xf18
/* status and enable have identical bit numbers */ /* status and enable have identical bit numbers */
...@@ -235,4 +234,4 @@ ...@@ -235,4 +234,4 @@
#define LINK_INT_GRF_OVER_FLOW (1<<5) #define LINK_INT_GRF_OVER_FLOW (1<<5)
#define LINK_INT_ITF_UNDER_FLOW (1<<4) #define LINK_INT_ITF_UNDER_FLOW (1<<4)
#define LINK_INT_ATF_UNDER_FLOW (1<<3) #define LINK_INT_ATF_UNDER_FLOW (1<<3)
#define LINK_INT_IARB_FAILED (1<<0) #define LINK_INT_IARB_FAILED (1<<0)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment