diff options
author | Stefan Reinauer <reinauer@chromium.org> | 2011-10-31 12:54:00 -0700 |
---|---|---|
committer | Patrick Georgi <patrick@georgi-clan.de> | 2011-11-01 19:08:23 +0100 |
commit | e11835e2995d130890ca9f45cb3e304f2ea3a6a9 (patch) | |
tree | cfc5345e9d98b231de0699714771a5d7f54c6ce1 /payloads/libpayload/include | |
parent | dd6906328904309e4d93e4bcb04a6cfa3646f29d (diff) |
libpayload: remove trailing whitespace and run dos2unix
Change-Id: Iffed3602456f5306711c65f06c873c58d4086e11
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/363
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'payloads/libpayload/include')
-rw-r--r-- | payloads/libpayload/include/lzma.h | 2 | ||||
-rw-r--r-- | payloads/libpayload/include/pci/pci.h | 216 | ||||
-rw-r--r-- | payloads/libpayload/include/term.h | 8 |
3 files changed, 113 insertions, 113 deletions
diff --git a/payloads/libpayload/include/lzma.h b/payloads/libpayload/include/lzma.h index 35f4c02c46..5be6f43935 100644 --- a/payloads/libpayload/include/lzma.h +++ b/payloads/libpayload/include/lzma.h @@ -32,7 +32,7 @@ /* decompresses the data stream at src to dst, determining its length from * the data stream itself. - * + * * returns the decompressed size, or 0 on error */ unsigned long ulzma(unsigned char *src, unsigned char *dst); diff --git a/payloads/libpayload/include/pci/pci.h b/payloads/libpayload/include/pci/pci.h index 565bdb5d7d..1f13ceea5b 100644 --- a/payloads/libpayload/include/pci/pci.h +++ b/payloads/libpayload/include/pci/pci.h @@ -1,108 +1,108 @@ -/*
- * This file is part of the libpayload project.
- *
- * Copyright (C) 2010 coresystems GmbH
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _PCI_PCI_H
-#define _PCI_PCI_H
-
-/* we implement at least this version */
-#define PCI_LIB_VERSION 0x020200
-
-#include <pci.h>
-
-#define PCI_CLASS_DEVICE REG_CLASS_DEV
-#define PCI_SUBSYSTEM_VENDOR_ID REG_SUBSYS_VENDOR_ID
-#define PCI_SUBSYSTEM_ID REG_SUBSYS_ID
-
-#define PCI_COMMAND REG_COMMAND
-#define PCI_COMMAND_IO REG_COMMAND_IO
-#define PCI_COMMAND_MEMORY REG_COMMAND_MEM
-#define PCI_COMMAND_MASTER REG_COMMAND_BM
-
-#define PCI_HEADER_TYPE REG_HEADER_TYPE
-#define PCI_HEADER_TYPE_NORMAL HEADER_TYPE_NORMAL
-#define PCI_HEADER_TYPE_BRIDGE HEADER_TYPE_BRIDGE
-#define PCI_HEADER_TYPE_CARDBUS HEADER_TYPE_CARDBUS
-
-#define PCI_BASE_ADDRESS_0 0x10
-#define PCI_BASE_ADDRESS_1 0x14
-#define PCI_BASE_ADDRESS_2 0x18
-#define PCI_BASE_ADDRESS_3 0x1c
-#define PCI_BASE_ADDRESS_4 0x20
-#define PCI_BASE_ADDRESS_5 0x24
-#define PCI_BASE_ADDRESS_SPACE 1 // mask
-#define PCI_BASE_ADDRESS_SPACE_IO 1
-#define PCI_BASE_ADDRESS_SPACE_MEM 0
-#define PCI_BASE_ADDRESS_IO_MASK ~0xf
-#define PCI_BASE_ADDRESS_MEM_MASK ~0x3
-
-#define PCI_ROM_ADDRESS 0x30
-#define PCI_ROM_ADDRESS1 0x38 // on bridges
-#define PCI_ROM_ADDRESS_MASK ~0x7ff
-
-#define PCI_VENDOR_ID_INTEL 0x8086
-
-struct pci_dev {
- u16 domain;
- u8 bus, dev, func;
- u16 vendor_id, device_id;
- struct pci_dev *next;
-};
-
-/*
- * values to match devices against.
- * "-1" means "don't care", everything else requires an exact match
- */
-struct pci_filter {
- int domain, bus, dev, func;
- int vendor, device;
- struct pci_dev *devices;
-};
-
-struct pci_access {
- struct pci_dev *devices;
-};
-
-u8 pci_read_byte(struct pci_dev *dev, int pos);
-u16 pci_read_word(struct pci_dev *dev, int pos);
-u32 pci_read_long(struct pci_dev *dev, int pos);
-
-int pci_write_byte(struct pci_dev *dev, int pos, u8 data);
-int pci_write_word(struct pci_dev *dev, int pos, u16 data);
-int pci_write_long(struct pci_dev *dev, int pos, u32 data);
-
-struct pci_access *pci_alloc(void);
-void pci_init(struct pci_access*);
-void pci_cleanup(struct pci_access*);
-char *pci_filter_parse_slot(struct pci_filter*, const char*);
-int pci_filter_match(struct pci_filter*, struct pci_dev*);
-void pci_filter_init(struct pci_access*, struct pci_filter*);
-void pci_scan_bus(struct pci_access*);
-struct pci_dev *pci_get_dev(struct pci_access*, u16, u8, u8, u8);
-
-#endif
+/* + * This file is part of the libpayload project. + * + * Copyright (C) 2010 coresystems GmbH + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _PCI_PCI_H +#define _PCI_PCI_H + +/* we implement at least this version */ +#define PCI_LIB_VERSION 0x020200 + +#include <pci.h> + +#define PCI_CLASS_DEVICE REG_CLASS_DEV +#define PCI_SUBSYSTEM_VENDOR_ID REG_SUBSYS_VENDOR_ID +#define PCI_SUBSYSTEM_ID REG_SUBSYS_ID + +#define PCI_COMMAND REG_COMMAND +#define PCI_COMMAND_IO REG_COMMAND_IO +#define PCI_COMMAND_MEMORY REG_COMMAND_MEM +#define PCI_COMMAND_MASTER REG_COMMAND_BM + +#define PCI_HEADER_TYPE REG_HEADER_TYPE +#define PCI_HEADER_TYPE_NORMAL HEADER_TYPE_NORMAL +#define PCI_HEADER_TYPE_BRIDGE HEADER_TYPE_BRIDGE +#define PCI_HEADER_TYPE_CARDBUS HEADER_TYPE_CARDBUS + +#define PCI_BASE_ADDRESS_0 0x10 +#define PCI_BASE_ADDRESS_1 0x14 +#define PCI_BASE_ADDRESS_2 0x18 +#define PCI_BASE_ADDRESS_3 0x1c +#define PCI_BASE_ADDRESS_4 0x20 +#define PCI_BASE_ADDRESS_5 0x24 +#define PCI_BASE_ADDRESS_SPACE 1 // mask +#define PCI_BASE_ADDRESS_SPACE_IO 1 +#define PCI_BASE_ADDRESS_SPACE_MEM 0 +#define PCI_BASE_ADDRESS_IO_MASK ~0xf +#define PCI_BASE_ADDRESS_MEM_MASK ~0x3 + +#define PCI_ROM_ADDRESS 0x30 +#define PCI_ROM_ADDRESS1 0x38 // on bridges +#define PCI_ROM_ADDRESS_MASK ~0x7ff + +#define PCI_VENDOR_ID_INTEL 0x8086 + +struct pci_dev { + u16 domain; + u8 bus, dev, func; + u16 vendor_id, device_id; + struct pci_dev *next; +}; + +/* + * values to match devices against. + * "-1" means "don't care", everything else requires an exact match + */ +struct pci_filter { + int domain, bus, dev, func; + int vendor, device; + struct pci_dev *devices; +}; + +struct pci_access { + struct pci_dev *devices; +}; + +u8 pci_read_byte(struct pci_dev *dev, int pos); +u16 pci_read_word(struct pci_dev *dev, int pos); +u32 pci_read_long(struct pci_dev *dev, int pos); + +int pci_write_byte(struct pci_dev *dev, int pos, u8 data); +int pci_write_word(struct pci_dev *dev, int pos, u16 data); +int pci_write_long(struct pci_dev *dev, int pos, u32 data); + +struct pci_access *pci_alloc(void); +void pci_init(struct pci_access*); +void pci_cleanup(struct pci_access*); +char *pci_filter_parse_slot(struct pci_filter*, const char*); +int pci_filter_match(struct pci_filter*, struct pci_dev*); +void pci_filter_init(struct pci_access*, struct pci_filter*); +void pci_scan_bus(struct pci_access*); +struct pci_dev *pci_get_dev(struct pci_access*, u16, u8, u8, u8); + +#endif diff --git a/payloads/libpayload/include/term.h b/payloads/libpayload/include/term.h index ce6bc4fae6..caacbdf7c4 100644 --- a/payloads/libpayload/include/term.h +++ b/payloads/libpayload/include/term.h @@ -2,9 +2,9 @@ /* $Id: term.h,v 1.16 2008/07/13 16:08:16 wmcbrine Exp $ */ -/* PDCurses doesn't operate with terminfo, but we need these functions for - compatibility, to allow some things (notably, interface libraries for - other languages) to be compiled. Anyone who tries to actually _use_ +/* PDCurses doesn't operate with terminfo, but we need these functions for + compatibility, to allow some things (notably, interface libraries for + other languages) to be compiled. Anyone who tries to actually _use_ them will be disappointed, since they only return ERR. */ #ifndef __PDCURSES_TERM_H__ @@ -46,7 +46,7 @@ char *tgoto(const char *, int, int); int tigetflag(const char *); int tigetnum(const char *); char *tigetstr(const char *); -char *tparm(const char *, long, long, long, long, long, +char *tparm(const char *, long, long, long, long, long, long, long, long, long); int tputs(const char *, int, int (*)(int)); |