diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2011-01-30 11:05:28 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2011-01-30 18:18:05 +0100 |
| commit | 9485dd02047b50ef561e6846cf5ee7406d16f682 (patch) | |
| tree | 6b8e0d3994b8bee02efe276915e9da001b89172f | |
| parent | b023e0b389979dc9730cd5bec42ead808691bb83 (diff) | |
| download | pcmciautils-9485dd02047b50ef561e6846cf5ee7406d16f682.tar.gz | |
read-cis: Remove a forward declaration and some whitespaces
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| -rw-r--r-- | src/read-cis.c | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/src/read-cis.c b/src/read-cis.c index 3583ca8..c0c74e0 100644 --- a/src/read-cis.c +++ b/src/read-cis.c @@ -30,7 +30,6 @@ #define IS_ATTR 1 #define IS_INDIRECT 8 - static unsigned int functions; static unsigned char cis_copy[MAX_TUPLES]; static unsigned int cis_length = MAX_TUPLES; @@ -44,32 +43,6 @@ static void read_cis(int attr, unsigned int addr, unsigned int len, void *ptr) return; } -int pcmcia_get_next_tuple(unsigned int function, tuple_t *tuple); - -int pcmcia_get_first_tuple(unsigned int function, tuple_t *tuple) -{ - tuple->TupleLink = 0; - tuple->Flags.link_space = tuple->Flags.mfc_fn = 0; - /* Assume presence of a LONGLINK_C to address 0 */ - tuple->CISOffset = tuple->LinkOffset = 0; - tuple->Flags.space = tuple->Flags.has_link = 1; - - if ((functions > 1) && - !(tuple->Attributes & TUPLE_RETURN_COMMON)) { - unsigned char req = tuple->DesiredTuple; - tuple->DesiredTuple = CISTPL_LONGLINK_MFC; - if (!pcmcia_get_next_tuple(function, tuple)) { - tuple->DesiredTuple = CISTPL_LINKTARGET; - if (pcmcia_get_next_tuple(function, tuple)) - return -ENODEV; - } else - tuple->CISOffset = tuple->TupleLink = 0; - tuple->DesiredTuple = req; - } - return pcmcia_get_next_tuple(function, tuple); -} - - static int follow_link(tuple_t *tuple) { unsigned char link[5]; @@ -196,6 +169,29 @@ int pcmcia_get_next_tuple(unsigned int function, tuple_t *tuple) return 0; } +int pcmcia_get_first_tuple(unsigned int function, tuple_t *tuple) +{ + tuple->TupleLink = 0; + tuple->Flags.link_space = tuple->Flags.mfc_fn = 0; + /* Assume presence of a LONGLINK_C to address 0 */ + tuple->CISOffset = tuple->LinkOffset = 0; + tuple->Flags.space = tuple->Flags.has_link = 1; + + if ((functions > 1) && + !(tuple->Attributes & TUPLE_RETURN_COMMON)) { + unsigned char req = tuple->DesiredTuple; + tuple->DesiredTuple = CISTPL_LONGLINK_MFC; + if (!pcmcia_get_next_tuple(function, tuple)) { + tuple->DesiredTuple = CISTPL_LINKTARGET; + if (pcmcia_get_next_tuple(function, tuple)) + return -ENODEV; + } else + tuple->CISOffset = tuple->TupleLink = 0; + tuple->DesiredTuple = req; + } + return pcmcia_get_next_tuple(function, tuple); +} + #define _MIN(a, b) (((a) < (b)) ? (a) : (b)) int pcmcia_get_tuple_data(tuple_t *tuple) @@ -218,7 +214,7 @@ int pcmcia_get_tuple_data(tuple_t *tuple) } -int read_out_cis (unsigned int socket_no, FILE *fd) +int read_out_cis(unsigned int socket_no, FILE *fd) { char file[SYSFS_PATH_MAX]; int ret, i; |