ieee1394/ieee1394_transactions: LIndent fixes
This patch contains fixes by LIndent. Signed-off-by: Jens-Michael Hoffmann <jensmh@gmx.de> Signed-off-by: Jody McIntyre <scjody@modernduck.com>
This commit is contained in:
parent
6649e92d79
commit
16c333a34a
|
@ -24,7 +24,6 @@
|
||||||
#include "nodemgr.h"
|
#include "nodemgr.h"
|
||||||
#include "ieee1394_transactions.h"
|
#include "ieee1394_transactions.h"
|
||||||
|
|
||||||
|
|
||||||
#define PREP_ASYNC_HEAD_ADDRESS(tc) \
|
#define PREP_ASYNC_HEAD_ADDRESS(tc) \
|
||||||
packet->tcode = tc; \
|
packet->tcode = tc; \
|
||||||
packet->header[0] = (packet->node_id << 16) | (packet->tlabel << 10) \
|
packet->header[0] = (packet->node_id << 16) | (packet->tlabel << 10) \
|
||||||
|
@ -32,7 +31,6 @@
|
||||||
packet->header[1] = (packet->host->node_id << 16) | (addr >> 32); \
|
packet->header[1] = (packet->host->node_id << 16) | (addr >> 32); \
|
||||||
packet->header[2] = addr & 0xffffffff
|
packet->header[2] = addr & 0xffffffff
|
||||||
|
|
||||||
|
|
||||||
static void fill_async_readquad(struct hpsb_packet *packet, u64 addr)
|
static void fill_async_readquad(struct hpsb_packet *packet, u64 addr)
|
||||||
{
|
{
|
||||||
PREP_ASYNC_HEAD_ADDRESS(TCODE_READQ);
|
PREP_ASYNC_HEAD_ADDRESS(TCODE_READQ);
|
||||||
|
@ -41,7 +39,8 @@ static void fill_async_readquad(struct hpsb_packet *packet, u64 addr)
|
||||||
packet->expect_response = 1;
|
packet->expect_response = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fill_async_readblock(struct hpsb_packet *packet, u64 addr, int length)
|
static void fill_async_readblock(struct hpsb_packet *packet, u64 addr,
|
||||||
|
int length)
|
||||||
{
|
{
|
||||||
PREP_ASYNC_HEAD_ADDRESS(TCODE_READB);
|
PREP_ASYNC_HEAD_ADDRESS(TCODE_READB);
|
||||||
packet->header[3] = length << 16;
|
packet->header[3] = length << 16;
|
||||||
|
@ -50,7 +49,8 @@ static void fill_async_readblock(struct hpsb_packet *packet, u64 addr, int lengt
|
||||||
packet->expect_response = 1;
|
packet->expect_response = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fill_async_writequad(struct hpsb_packet *packet, u64 addr, quadlet_t data)
|
static void fill_async_writequad(struct hpsb_packet *packet, u64 addr,
|
||||||
|
quadlet_t data)
|
||||||
{
|
{
|
||||||
PREP_ASYNC_HEAD_ADDRESS(TCODE_WRITEQ);
|
PREP_ASYNC_HEAD_ADDRESS(TCODE_WRITEQ);
|
||||||
packet->header[3] = data;
|
packet->header[3] = data;
|
||||||
|
@ -59,7 +59,8 @@ static void fill_async_writequad(struct hpsb_packet *packet, u64 addr, quadlet_t
|
||||||
packet->expect_response = 1;
|
packet->expect_response = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fill_async_writeblock(struct hpsb_packet *packet, u64 addr, int length)
|
static void fill_async_writeblock(struct hpsb_packet *packet, u64 addr,
|
||||||
|
int length)
|
||||||
{
|
{
|
||||||
PREP_ASYNC_HEAD_ADDRESS(TCODE_WRITEB);
|
PREP_ASYNC_HEAD_ADDRESS(TCODE_WRITEB);
|
||||||
packet->header[3] = length << 16;
|
packet->header[3] = length << 16;
|
||||||
|
@ -186,8 +187,6 @@ void hpsb_free_tlabel(struct hpsb_packet *packet)
|
||||||
up(&tp->count);
|
up(&tp->count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int hpsb_packet_success(struct hpsb_packet *packet)
|
int hpsb_packet_success(struct hpsb_packet *packet)
|
||||||
{
|
{
|
||||||
switch (packet->ack_code) {
|
switch (packet->ack_code) {
|
||||||
|
@ -229,7 +228,6 @@ int hpsb_packet_success(struct hpsb_packet *packet)
|
||||||
return -EAGAIN;
|
return -EAGAIN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
case ACK_DATA_ERROR:
|
case ACK_DATA_ERROR:
|
||||||
if (packet->tcode == TCODE_WRITEB
|
if (packet->tcode == TCODE_WRITEB
|
||||||
|| packet->tcode == TCODE_LOCK_REQUEST) {
|
|| packet->tcode == TCODE_LOCK_REQUEST) {
|
||||||
|
@ -289,8 +287,9 @@ struct hpsb_packet *hpsb_make_readpacket(struct hpsb_host *host, nodeid_t node,
|
||||||
return packet;
|
return packet;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct hpsb_packet *hpsb_make_writepacket (struct hpsb_host *host, nodeid_t node,
|
struct hpsb_packet *hpsb_make_writepacket(struct hpsb_host *host, nodeid_t node,
|
||||||
u64 addr, quadlet_t *buffer, size_t length)
|
u64 addr, quadlet_t * buffer,
|
||||||
|
size_t length)
|
||||||
{
|
{
|
||||||
struct hpsb_packet *packet;
|
struct hpsb_packet *packet;
|
||||||
|
|
||||||
|
@ -323,8 +322,9 @@ struct hpsb_packet *hpsb_make_writepacket (struct hpsb_host *host, nodeid_t node
|
||||||
return packet;
|
return packet;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct hpsb_packet *hpsb_make_streampacket(struct hpsb_host *host, u8 *buffer, int length,
|
struct hpsb_packet *hpsb_make_streampacket(struct hpsb_host *host, u8 * buffer,
|
||||||
int channel, int tag, int sync)
|
int length, int channel, int tag,
|
||||||
|
int sync)
|
||||||
{
|
{
|
||||||
struct hpsb_packet *packet;
|
struct hpsb_packet *packet;
|
||||||
|
|
||||||
|
@ -353,14 +353,15 @@ struct hpsb_packet *hpsb_make_streampacket(struct hpsb_host *host, u8 *buffer, i
|
||||||
}
|
}
|
||||||
|
|
||||||
struct hpsb_packet *hpsb_make_lockpacket(struct hpsb_host *host, nodeid_t node,
|
struct hpsb_packet *hpsb_make_lockpacket(struct hpsb_host *host, nodeid_t node,
|
||||||
u64 addr, int extcode, quadlet_t *data,
|
u64 addr, int extcode,
|
||||||
quadlet_t arg)
|
quadlet_t * data, quadlet_t arg)
|
||||||
{
|
{
|
||||||
struct hpsb_packet *p;
|
struct hpsb_packet *p;
|
||||||
u32 length;
|
u32 length;
|
||||||
|
|
||||||
p = hpsb_alloc_packet(8);
|
p = hpsb_alloc_packet(8);
|
||||||
if (!p) return NULL;
|
if (!p)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
p->host = host;
|
p->host = host;
|
||||||
p->node_id = node;
|
p->node_id = node;
|
||||||
|
@ -389,15 +390,16 @@ struct hpsb_packet *hpsb_make_lockpacket(struct hpsb_host *host, nodeid_t node,
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct hpsb_packet *hpsb_make_lock64packet(struct hpsb_host *host, nodeid_t node,
|
struct hpsb_packet *hpsb_make_lock64packet(struct hpsb_host *host,
|
||||||
u64 addr, int extcode, octlet_t *data,
|
nodeid_t node, u64 addr, int extcode,
|
||||||
octlet_t arg)
|
octlet_t * data, octlet_t arg)
|
||||||
{
|
{
|
||||||
struct hpsb_packet *p;
|
struct hpsb_packet *p;
|
||||||
u32 length;
|
u32 length;
|
||||||
|
|
||||||
p = hpsb_alloc_packet(16);
|
p = hpsb_alloc_packet(16);
|
||||||
if (!p) return NULL;
|
if (!p)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
p->host = host;
|
p->host = host;
|
||||||
p->node_id = node;
|
p->node_id = node;
|
||||||
|
@ -430,13 +432,13 @@ struct hpsb_packet *hpsb_make_lock64packet(struct hpsb_host *host, nodeid_t node
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct hpsb_packet *hpsb_make_phypacket(struct hpsb_host *host,
|
struct hpsb_packet *hpsb_make_phypacket(struct hpsb_host *host, quadlet_t data)
|
||||||
quadlet_t data)
|
|
||||||
{
|
{
|
||||||
struct hpsb_packet *p;
|
struct hpsb_packet *p;
|
||||||
|
|
||||||
p = hpsb_alloc_packet(0);
|
p = hpsb_alloc_packet(0);
|
||||||
if (!p) return NULL;
|
if (!p)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
p->host = host;
|
p->host = host;
|
||||||
fill_phy_packet(p, data);
|
fill_phy_packet(p, data);
|
||||||
|
@ -451,7 +453,8 @@ struct hpsb_packet *hpsb_make_isopacket(struct hpsb_host *host,
|
||||||
struct hpsb_packet *p;
|
struct hpsb_packet *p;
|
||||||
|
|
||||||
p = hpsb_alloc_packet(length);
|
p = hpsb_alloc_packet(length);
|
||||||
if (!p) return NULL;
|
if (!p)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
p->host = host;
|
p->host = host;
|
||||||
fill_iso_packet(p, length, channel, tag, sync);
|
fill_iso_packet(p, length, channel, tag, sync);
|
||||||
|
@ -467,7 +470,7 @@ struct hpsb_packet *hpsb_make_isopacket(struct hpsb_host *host,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int hpsb_read(struct hpsb_host *host, nodeid_t node, unsigned int generation,
|
int hpsb_read(struct hpsb_host *host, nodeid_t node, unsigned int generation,
|
||||||
u64 addr, quadlet_t *buffer, size_t length)
|
u64 addr, quadlet_t * buffer, size_t length)
|
||||||
{
|
{
|
||||||
struct hpsb_packet *packet;
|
struct hpsb_packet *packet;
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
|
@ -498,16 +501,15 @@ int hpsb_read(struct hpsb_host *host, nodeid_t node, unsigned int generation,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
hpsb_read_fail:
|
hpsb_read_fail:
|
||||||
hpsb_free_tlabel(packet);
|
hpsb_free_tlabel(packet);
|
||||||
hpsb_free_packet(packet);
|
hpsb_free_packet(packet);
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation,
|
int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation,
|
||||||
u64 addr, quadlet_t *buffer, size_t length)
|
u64 addr, quadlet_t * buffer, size_t length)
|
||||||
{
|
{
|
||||||
struct hpsb_packet *packet;
|
struct hpsb_packet *packet;
|
||||||
int retval;
|
int retval;
|
||||||
|
@ -517,7 +519,7 @@ int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation,
|
||||||
|
|
||||||
BUG_ON(in_interrupt()); // We can't be called in an interrupt, yet
|
BUG_ON(in_interrupt()); // We can't be called in an interrupt, yet
|
||||||
|
|
||||||
packet = hpsb_make_writepacket (host, node, addr, buffer, length);
|
packet = hpsb_make_writepacket(host, node, addr, buffer, length);
|
||||||
|
|
||||||
if (!packet)
|
if (!packet)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -529,7 +531,7 @@ int hpsb_write(struct hpsb_host *host, nodeid_t node, unsigned int generation,
|
||||||
|
|
||||||
retval = hpsb_packet_success(packet);
|
retval = hpsb_packet_success(packet);
|
||||||
|
|
||||||
hpsb_write_fail:
|
hpsb_write_fail:
|
||||||
hpsb_free_tlabel(packet);
|
hpsb_free_tlabel(packet);
|
||||||
hpsb_free_packet(packet);
|
hpsb_free_packet(packet);
|
||||||
|
|
||||||
|
@ -539,7 +541,7 @@ hpsb_write_fail:
|
||||||
#if 0
|
#if 0
|
||||||
|
|
||||||
int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation,
|
int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation,
|
||||||
u64 addr, int extcode, quadlet_t *data, quadlet_t arg)
|
u64 addr, int extcode, quadlet_t * data, quadlet_t arg)
|
||||||
{
|
{
|
||||||
struct hpsb_packet *packet;
|
struct hpsb_packet *packet;
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
|
@ -561,16 +563,15 @@ int hpsb_lock(struct hpsb_host *host, nodeid_t node, unsigned int generation,
|
||||||
*data = packet->data[0];
|
*data = packet->data[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
hpsb_lock_fail:
|
hpsb_lock_fail:
|
||||||
hpsb_free_tlabel(packet);
|
hpsb_free_tlabel(packet);
|
||||||
hpsb_free_packet(packet);
|
hpsb_free_packet(packet);
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int hpsb_send_gasp(struct hpsb_host *host, int channel, unsigned int generation,
|
int hpsb_send_gasp(struct hpsb_host *host, int channel, unsigned int generation,
|
||||||
quadlet_t *buffer, size_t length, u32 specifier_id,
|
quadlet_t * buffer, size_t length, u32 specifier_id,
|
||||||
unsigned int version)
|
unsigned int version)
|
||||||
{
|
{
|
||||||
struct hpsb_packet *packet;
|
struct hpsb_packet *packet;
|
||||||
|
@ -587,7 +588,8 @@ int hpsb_send_gasp(struct hpsb_host *host, int channel, unsigned int generation,
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
packet->data[0] = cpu_to_be32((host->node_id << 16) | specifier_id_hi);
|
packet->data[0] = cpu_to_be32((host->node_id << 16) | specifier_id_hi);
|
||||||
packet->data[1] = cpu_to_be32((specifier_id_lo << 24) | (version & 0x00ffffff));
|
packet->data[1] =
|
||||||
|
cpu_to_be32((specifier_id_lo << 24) | (version & 0x00ffffff));
|
||||||
|
|
||||||
memcpy(&(packet->data[2]), buffer, length - 8);
|
memcpy(&(packet->data[2]), buffer, length - 8);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue