summaryrefslogtreecommitdiffstats
path: root/sys/boot/efi/libefi
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2015-12-22 20:36:14 +0000
committeremaste <emaste@FreeBSD.org>2015-12-22 20:36:14 +0000
commit3808bf980c2c46dcb44722f214c1d89db5b6c04d (patch)
tree9e9fb52ecdfe3b93ab5e8d77874b215d5e542655 /sys/boot/efi/libefi
parentb665ac07581ab1fbd0d71db29a027b4a39734789 (diff)
downloadFreeBSD-src-3808bf980c2c46dcb44722f214c1d89db5b6c04d.zip
FreeBSD-src-3808bf980c2c46dcb44722f214c1d89db5b6c04d.tar.gz
Support a.out format in nlist only on i386
i386 is the only current FreeBSD architecture that ever used a.out format. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D4687
Diffstat (limited to 'sys/boot/efi/libefi')
-rw-r--r--sys/boot/efi/libefi/efinet.c6
-rw-r--r--sys/boot/efi/libefi/efipart.c8
-rw-r--r--sys/boot/efi/libefi/time.c22
3 files changed, 18 insertions, 18 deletions
diff --git a/sys/boot/efi/libefi/efinet.c b/sys/boot/efi/libefi/efinet.c
index f1e6143..2c39edc 100644
--- a/sys/boot/efi/libefi/efinet.c
+++ b/sys/boot/efi/libefi/efinet.c
@@ -50,7 +50,7 @@ static int efinet_match(struct netif *, void *);
static int efinet_probe(struct netif *, void *);
static int efinet_put(struct iodesc *, void *, size_t);
-struct netif_driver efinetif = {
+struct netif_driver efinetif = {
.netif_bname = "efinet",
.netif_match = efinet_match,
.netif_probe = efinet_probe,
@@ -132,7 +132,7 @@ efinet_put(struct iodesc *desc, void *pkt, size_t len)
buf = 0; /* XXX Is this needed? */
status = net->GetStatus(net, 0, &buf);
/*
- * XXX EFI1.1 and the E1000 card returns a different
+ * XXX EFI1.1 and the E1000 card returns a different
* address than we gave. Sigh.
*/
} while (status == EFI_SUCCESS && buf == 0);
@@ -234,7 +234,7 @@ efinet_init(struct iodesc *desc, void *machdep_hint)
static void
efinet_end(struct netif *nif)
{
- EFI_SIMPLE_NETWORK *net = nif->nif_devdata;
+ EFI_SIMPLE_NETWORK *net = nif->nif_devdata;
net->Shutdown(net);
}
diff --git a/sys/boot/efi/libefi/efipart.c b/sys/boot/efi/libefi/efipart.c
index 0831a98..6240f41 100644
--- a/sys/boot/efi/libefi/efipart.c
+++ b/sys/boot/efi/libefi/efipart.c
@@ -60,7 +60,7 @@ struct devsw efipart_dev = {
};
static int
-efipart_init(void)
+efipart_init(void)
{
EFI_BLOCK_IO *blkio;
EFI_DEVICE_PATH *devpath, *devpathcpy, *tmpdevpath, *node;
@@ -174,7 +174,7 @@ efipart_print(int verbose)
}
}
-static int
+static int
efipart_open(struct open_file *f, ...)
{
va_list args;
@@ -202,7 +202,7 @@ efipart_open(struct open_file *f, ...)
return (0);
}
-static int
+static int
efipart_close(struct open_file *f)
{
struct devdesc *dev;
@@ -255,7 +255,7 @@ efipart_readwrite(EFI_BLOCK_IO *blkio, int rw, daddr_t blk, daddr_t nblks,
return (efi_status_to_errno(status));
}
-static int
+static int
efipart_strategy(void *devdata, int rw, daddr_t blk, size_t size, char *buf,
size_t *rsize)
{
diff --git a/sys/boot/efi/libefi/time.c b/sys/boot/efi/libefi/time.c
index 5c39415..36e5ad7 100644
--- a/sys/boot/efi/libefi/time.c
+++ b/sys/boot/efi/libefi/time.c
@@ -2,28 +2,28 @@
* Copyright (c) 1999, 2000
* Intel Corporation.
* All rights reserved.
- *
+ *
* 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
- *
+ *
* This product includes software developed by Intel Corporation and
* its contributors.
- *
+ *
* 4. Neither the name of Intel Corporation or its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION 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
@@ -35,7 +35,7 @@
* 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.
- *
+ *
*/
#include <sys/cdefs.h>
@@ -96,7 +96,7 @@ efi_time(EFI_TIME *ETime)
31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30,
31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 }};
- time_t UTime;
+ time_t UTime;
int Year;
/*
@@ -124,7 +124,7 @@ efi_time(EFI_TIME *ETime)
/*
// UTime should now be set to 00:00:00 on Jan 1 of the file's year.
//
- // Months
+ // Months
*/
UTime += (CumulativeDays[isleap(ETime->Year)][ETime->Month] * SECSPERDAY);
@@ -160,7 +160,7 @@ efi_time(EFI_TIME *ETime)
*/
UTime += (ETime->TimeZone * 60);
}
-
+
return UTime;
}
OpenPOWER on IntegriCloud