Skip to content

Commit

Permalink
ieee1394: whitespace cleanup in hosts.[ch], ieee1394_core.[ch]
Browse files Browse the repository at this point in the history 
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>
  • Loading branch information
Stefan Richter authored and Jody McIntyre committed Dec 1, 2005
1 parent 546513f commit 741854e
Show file tree
Hide file tree
Showing 4 changed files with 526 additions and 526 deletions.
28 changes: 14 additions & 14 deletions drivers/ieee1394/hosts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ static void delayed_reset_bus(void * __reset_info)

static int dummy_transmit_packet(struct hpsb_host *h, struct hpsb_packet *p)
{
return 0;
return 0;
}

static int dummy_devctl(struct hpsb_host *h, enum devctl_cmd c, int arg)
{
return -1;
return -1;
}

static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command, unsigned long arg)
Expand All @@ -75,9 +75,9 @@ static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command, unsigned
}

static struct hpsb_host_driver dummy_driver = {
.transmit_packet = dummy_transmit_packet,
.devctl = dummy_devctl,
.isoctl = dummy_isoctl
.transmit_packet = dummy_transmit_packet,
.devctl = dummy_devctl,
.isoctl = dummy_isoctl
};

static int alloc_hostnum_cb(struct hpsb_host *host, void *__data)
Expand Down Expand Up @@ -110,12 +110,12 @@ static DECLARE_MUTEX(host_num_alloc);
struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
struct device *dev)
{
struct hpsb_host *h;
struct hpsb_host *h;
int i;
int hostnum = 0;

h = kzalloc(sizeof(*h) + extra, SLAB_KERNEL);
if (!h)
h = kzalloc(sizeof(*h) + extra, SLAB_KERNEL);
if (!h)
return NULL;

h->csr.rom = csr1212_create_csr(&csr_bus_ops, CSR_BUS_INFO_SIZE, h);
Expand All @@ -125,7 +125,7 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
}

h->hostdata = h + 1;
h->driver = drv;
h->driver = drv;

skb_queue_head_init(&h->pending_packet_queue);
INIT_LIST_HEAD(&h->addr_space);
Expand All @@ -145,8 +145,8 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
h->timeout.function = abort_timedouts;
h->timeout_interval = HZ / 20; // 50ms by default

h->topology_map = h->csr.topology_map + 3;
h->speed_map = (u8 *)(h->csr.speed_map + 2);
h->topology_map = h->csr.topology_map + 3;
h->speed_map = (u8 *)(h->csr.speed_map + 2);

down(&host_num_alloc);

Expand Down Expand Up @@ -186,14 +186,14 @@ int hpsb_add_host(struct hpsb_host *host)

void hpsb_remove_host(struct hpsb_host *host)
{
host->is_shutdown = 1;
host->is_shutdown = 1;

cancel_delayed_work(&host->delayed_reset);
flush_scheduled_work();

host->driver = &dummy_driver;
host->driver = &dummy_driver;

highlevel_remove_host(host);
highlevel_remove_host(host);

hpsb_remove_extra_config_roms(host);

Expand Down
162 changes: 81 additions & 81 deletions drivers/ieee1394/hosts.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,47 @@ struct hpsb_packet;
struct hpsb_iso;

struct hpsb_host {
struct list_head host_list;
struct list_head host_list;

void *hostdata;
void *hostdata;

atomic_t generation;
atomic_t generation;

struct sk_buff_head pending_packet_queue;

struct timer_list timeout;
unsigned long timeout_interval;

unsigned char iso_listen_count[64];
unsigned char iso_listen_count[64];

int node_count; /* number of identified nodes on this bus */
int selfid_count; /* total number of SelfIDs received */
int node_count; /* number of identified nodes on this bus */
int selfid_count; /* total number of SelfIDs received */
int nodes_active; /* number of nodes that are actually active */

nodeid_t node_id; /* node ID of this host */
nodeid_t irm_id; /* ID of this bus' isochronous resource manager */
nodeid_t busmgr_id; /* ID of this bus' bus manager */
nodeid_t node_id; /* node ID of this host */
nodeid_t irm_id; /* ID of this bus' isochronous resource manager */
nodeid_t busmgr_id; /* ID of this bus' bus manager */

/* this nodes state */
unsigned in_bus_reset:1;
unsigned is_shutdown:1;
/* this nodes state */
unsigned in_bus_reset:1;
unsigned is_shutdown:1;
unsigned resume_packet_sent:1;

/* this nodes' duties on the bus */
unsigned is_root:1;
unsigned is_cycmst:1;
unsigned is_irm:1;
unsigned is_busmgr:1;
/* this nodes' duties on the bus */
unsigned is_root:1;
unsigned is_cycmst:1;
unsigned is_irm:1;
unsigned is_busmgr:1;

int reset_retries;
quadlet_t *topology_map;
u8 *speed_map;
struct csr_control csr;
int reset_retries;
quadlet_t *topology_map;
u8 *speed_map;
struct csr_control csr;

/* Per node tlabel pool allocation */
struct hpsb_tlabel_pool tpool[64];

struct hpsb_host_driver *driver;
struct hpsb_host_driver *driver;

struct pci_dev *pdev;

Expand All @@ -77,34 +77,34 @@ struct hpsb_host {


enum devctl_cmd {
/* Host is requested to reset its bus and cancel all outstanding async
* requests. If arg == 1, it shall also attempt to become root on the
* bus. Return void. */
RESET_BUS,

/* Arg is void, return value is the hardware cycle counter value. */
GET_CYCLE_COUNTER,

/* Set the hardware cycle counter to the value in arg, return void.
* FIXME - setting is probably not required. */
SET_CYCLE_COUNTER,

/* Configure hardware for new bus ID in arg, return void. */
SET_BUS_ID,

/* If arg true, start sending cycle start packets, stop if arg == 0.
* Return void. */
ACT_CYCLE_MASTER,

/* Cancel all outstanding async requests without resetting the bus.
* Return void. */
CANCEL_REQUESTS,

/* Start or stop receiving isochronous channel in arg. Return void.
* This acts as an optimization hint, hosts are not required not to
* listen on unrequested channels. */
ISO_LISTEN_CHANNEL,
ISO_UNLISTEN_CHANNEL
/* Host is requested to reset its bus and cancel all outstanding async
* requests. If arg == 1, it shall also attempt to become root on the
* bus. Return void. */
RESET_BUS,

/* Arg is void, return value is the hardware cycle counter value. */
GET_CYCLE_COUNTER,

/* Set the hardware cycle counter to the value in arg, return void.
* FIXME - setting is probably not required. */
SET_CYCLE_COUNTER,

/* Configure hardware for new bus ID in arg, return void. */
SET_BUS_ID,

/* If arg true, start sending cycle start packets, stop if arg == 0.
* Return void. */
ACT_CYCLE_MASTER,

/* Cancel all outstanding async requests without resetting the bus.
* Return void. */
CANCEL_REQUESTS,

/* Start or stop receiving isochronous channel in arg. Return void.
* This acts as an optimization hint, hosts are not required not to
* listen on unrequested channels. */
ISO_LISTEN_CHANNEL,
ISO_UNLISTEN_CHANNEL
};

enum isoctl_cmd {
Expand Down Expand Up @@ -135,13 +135,13 @@ enum isoctl_cmd {
};

enum reset_types {
/* 166 microsecond reset -- only type of reset available on
non-1394a capable controllers */
LONG_RESET,
/* 166 microsecond reset -- only type of reset available on
non-1394a capable controllers */
LONG_RESET,

/* Short (arbitrated) reset -- only available on 1394a capable
controllers */
SHORT_RESET,
/* Short (arbitrated) reset -- only available on 1394a capable
controllers */
SHORT_RESET,

/* Variants that set force_root before issueing the bus reset */
LONG_RESET_FORCE_ROOT, SHORT_RESET_FORCE_ROOT,
Expand All @@ -159,38 +159,38 @@ struct hpsb_host_driver {
* reads to the ConfigROM on its own. */
void (*set_hw_config_rom) (struct hpsb_host *host, quadlet_t *config_rom);

/* This function shall implement packet transmission based on
* packet->type. It shall CRC both parts of the packet (unless
* packet->type == raw) and do byte-swapping as necessary or instruct
* the hardware to do so. It can return immediately after the packet
* was queued for sending. After sending, hpsb_sent_packet() has to be
* called. Return 0 on success, negative errno on failure.
* NOTE: The function must be callable in interrupt context.
*/
int (*transmit_packet) (struct hpsb_host *host,
struct hpsb_packet *packet);

/* This function requests miscellanous services from the driver, see
* above for command codes and expected actions. Return -1 for unknown
* command, though that should never happen.
*/
int (*devctl) (struct hpsb_host *host, enum devctl_cmd command, int arg);
/* This function shall implement packet transmission based on
* packet->type. It shall CRC both parts of the packet (unless
* packet->type == raw) and do byte-swapping as necessary or instruct
* the hardware to do so. It can return immediately after the packet
* was queued for sending. After sending, hpsb_sent_packet() has to be
* called. Return 0 on success, negative errno on failure.
* NOTE: The function must be callable in interrupt context.
*/
int (*transmit_packet) (struct hpsb_host *host,
struct hpsb_packet *packet);

/* This function requests miscellanous services from the driver, see
* above for command codes and expected actions. Return -1 for unknown
* command, though that should never happen.
*/
int (*devctl) (struct hpsb_host *host, enum devctl_cmd command, int arg);

/* ISO transmission/reception functions. Return 0 on success, -1
* (or -EXXX errno code) on failure. If the low-level driver does not
* support the new ISO API, set isoctl to NULL.
*/
int (*isoctl) (struct hpsb_iso *iso, enum isoctl_cmd command, unsigned long arg);

/* This function is mainly to redirect local CSR reads/locks to the iso
* management registers (bus manager id, bandwidth available, channels
* available) to the hardware registers in OHCI. reg is 0,1,2,3 for bus
* mgr, bwdth avail, ch avail hi, ch avail lo respectively (the same ids
* as OHCI uses). data and compare are the new data and expected data
* respectively, return value is the old value.
*/
quadlet_t (*hw_csr_reg) (struct hpsb_host *host, int reg,
quadlet_t data, quadlet_t compare);
/* This function is mainly to redirect local CSR reads/locks to the iso
* management registers (bus manager id, bandwidth available, channels
* available) to the hardware registers in OHCI. reg is 0,1,2,3 for bus
* mgr, bwdth avail, ch avail hi, ch avail lo respectively (the same ids
* as OHCI uses). data and compare are the new data and expected data
* respectively, return value is the old value.
*/
quadlet_t (*hw_csr_reg) (struct hpsb_host *host, int reg,
quadlet_t data, quadlet_t compare);
};


Expand Down
Loading

0 comments on commit 741854e

Please sign in to comment.