summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/stand')
-rw-r--r--sys/arch/i386/stand/boot/conf.c4
-rw-r--r--sys/arch/i386/stand/cdboot/conf.c4
-rw-r--r--sys/arch/i386/stand/libsa/biosdev.c4
-rw-r--r--sys/arch/i386/stand/libsa/biosdev.h4
-rw-r--r--sys/arch/i386/stand/libsa/disk.h4
-rw-r--r--sys/arch/i386/stand/libsa/diskprobe.c4
-rw-r--r--sys/arch/i386/stand/libsa/pxe_net.c4
-rw-r--r--sys/arch/i386/stand/libsa/pxe_net.h4
-rw-r--r--sys/arch/i386/stand/libsa/softraid_i386.c4
-rw-r--r--sys/arch/i386/stand/libsa/softraid_i386.h4
-rw-r--r--sys/arch/i386/stand/pxeboot/conf.c4
11 files changed, 22 insertions, 22 deletions
diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c
index 22b14e1bb7a..ab2cf8b81cd 100644
--- a/sys/arch/i386/stand/boot/conf.c
+++ b/sys/arch/i386/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.75 2020/06/14 16:06:25 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.76 2020/12/09 18:10:18 krw Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -42,7 +42,7 @@
#include <dev/cons.h>
#include "debug.h"
-const char version[] = "3.43";
+const char version[] = "3.44";
int debug = 1;
diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c
index f914253d4d6..04444293a3b 100644
--- a/sys/arch/i386/stand/cdboot/conf.c
+++ b/sys/arch/i386/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.42 2020/06/14 16:06:25 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.43 2020/12/09 18:10:18 krw Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -43,7 +43,7 @@
#include <dev/cons.h>
#include "debug.h"
-const char version[] = "3.43";
+const char version[] = "3.44";
int debug = 1;
void (*sa_cleanup)(void) = NULL;
diff --git a/sys/arch/i386/stand/libsa/biosdev.c b/sys/arch/i386/stand/libsa/biosdev.c
index 394fc6b061d..d4031c4608e 100644
--- a/sys/arch/i386/stand/libsa/biosdev.c
+++ b/sys/arch/i386/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biosdev.c,v 1.99 2018/12/16 08:33:16 otto Exp $ */
+/* $OpenBSD: biosdev.c,v 1.100 2020/12/09 18:10:18 krw Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -727,7 +727,7 @@ biosdisk_errno(u_int error)
}
int
-biosstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+biosstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
size_t *rsize)
{
struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/i386/stand/libsa/biosdev.h b/sys/arch/i386/stand/libsa/biosdev.h
index 96a812b10e9..588f03150cc 100644
--- a/sys/arch/i386/stand/libsa/biosdev.h
+++ b/sys/arch/i386/stand/libsa/biosdev.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: biosdev.h,v 1.34 2015/09/02 04:09:24 yasuoka Exp $ */
+/* $OpenBSD: biosdev.h,v 1.35 2020/12/09 18:10:18 krw Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -45,7 +45,7 @@ struct diskinfo;
/* biosdev.c */
extern const char *biosdevs[];
-int biosstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int biosstrategy(void *, int, daddr_t, size_t, void *, size_t *);
int biosopen(struct open_file *, ...);
int biosclose(struct open_file *);
int biosioctl(struct open_file *, u_long, void *);
diff --git a/sys/arch/i386/stand/libsa/disk.h b/sys/arch/i386/stand/libsa/disk.h
index 0480574b37d..5d46a506d56 100644
--- a/sys/arch/i386/stand/libsa/disk.h
+++ b/sys/arch/i386/stand/libsa/disk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.h,v 1.7 2017/07/21 01:21:42 yasuoka Exp $ */
+/* $OpenBSD: disk.h,v 1.8 2020/12/09 18:10:18 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -43,7 +43,7 @@ struct diskinfo {
struct sr_boot_volume *sr_vol;
int (*diskio)(int, struct diskinfo *, u_int, int, void *);
- int (*strategy)(void *, int, daddr32_t, size_t, void *, size_t *);
+ int (*strategy)(void *, int, daddr_t, size_t, void *, size_t *);
dev_t bsddev, bootdev;
diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c
index ea38de771f6..28c5a55d7c8 100644
--- a/sys/arch/i386/stand/libsa/diskprobe.c
+++ b/sys/arch/i386/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diskprobe.c,v 1.46 2018/06/18 15:37:48 krw Exp $ */
+/* $OpenBSD: diskprobe.c,v 1.47 2020/12/09 18:10:18 krw Exp $ */
/*
* Copyright (c) 1997 Tobias Weingartner
@@ -483,7 +483,7 @@ check_hibernate(struct diskinfo *dip)
DL_GETPSIZE(&dip->disklabel.d_partitions[1]) -
(sizeof(union hibernate_info) / DEV_BSIZE);
- error = dip->strategy(dip, F_READ, (daddr32_t)sec, sizeof hib, &hib, NULL);
+ error = dip->strategy(dip, F_READ, sec, sizeof hib, &hib, NULL);
if (error == 0 && hib.magic == HIBERNATE_MAGIC)
dip->bios_info.flags |= BDI_HIBVALID; /* Hibernate present */
}
diff --git a/sys/arch/i386/stand/libsa/pxe_net.c b/sys/arch/i386/stand/libsa/pxe_net.c
index 6473ec6ca6e..3eecf513d9b 100644
--- a/sys/arch/i386/stand/libsa/pxe_net.c
+++ b/sys/arch/i386/stand/libsa/pxe_net.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxe_net.c,v 1.6 2017/05/08 20:13:10 patrick Exp $ */
+/* $OpenBSD: pxe_net.c,v 1.7 2020/12/09 18:10:18 krw Exp $ */
/* $NetBSD: dev_net.c,v 1.4 2003/03/12 13:15:08 drochner Exp $ */
/*-
@@ -143,7 +143,7 @@ net_ioctl(struct open_file *f, u_long cmd, void *data)
}
int
-net_strategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+net_strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
size_t *rsize)
{
return EIO;
diff --git a/sys/arch/i386/stand/libsa/pxe_net.h b/sys/arch/i386/stand/libsa/pxe_net.h
index e70e4503947..c412cb94b64 100644
--- a/sys/arch/i386/stand/libsa/pxe_net.h
+++ b/sys/arch/i386/stand/libsa/pxe_net.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxe_net.h,v 1.3 2011/03/13 00:13:53 deraadt Exp $ */
+/* $OpenBSD: pxe_net.h,v 1.4 2020/12/09 18:10:18 krw Exp $ */
/* $NetBSD$ */
/*-
@@ -34,4 +34,4 @@
int net_open(struct open_file *, ...);
int net_close(struct open_file *);
int net_ioctl(struct open_file *, u_long, void *);
-int net_strategy(void *, int , daddr32_t , size_t, void *, size_t *);
+int net_strategy(void *, int , daddr_t , size_t, void *, size_t *);
diff --git a/sys/arch/i386/stand/libsa/softraid_i386.c b/sys/arch/i386/stand/libsa/softraid_i386.c
index 0332b8e778b..ac86d21f7b3 100644
--- a/sys/arch/i386/stand/libsa/softraid_i386.c
+++ b/sys/arch/i386/stand/libsa/softraid_i386.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_i386.c,v 1.3 2017/12/18 12:53:33 fcambus Exp $ */
+/* $OpenBSD: softraid_i386.c,v 1.4 2020/12/09 18:10:18 krw Exp $ */
/*
* Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -304,7 +304,7 @@ srprobe(void)
}
int
-sr_strategy(struct sr_boot_volume *bv, int rw, daddr32_t blk, size_t size,
+sr_strategy(struct sr_boot_volume *bv, int rw, daddr_t blk, size_t size,
void *buf, size_t *rsize)
{
struct diskinfo *sr_dip, *dip;
diff --git a/sys/arch/i386/stand/libsa/softraid_i386.h b/sys/arch/i386/stand/libsa/softraid_i386.h
index 9294e687e8a..00c051b686d 100644
--- a/sys/arch/i386/stand/libsa/softraid_i386.h
+++ b/sys/arch/i386/stand/libsa/softraid_i386.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_i386.h,v 1.3 2016/09/11 17:52:47 jsing Exp $ */
+/* $OpenBSD: softraid_i386.h,v 1.4 2020/12/09 18:10:18 krw Exp $ */
/*
* Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -22,7 +22,7 @@
void srprobe(void);
const char *sr_getdisklabel(struct sr_boot_volume *, struct disklabel *);
-int sr_strategy(struct sr_boot_volume *, int, daddr32_t, size_t,
+int sr_strategy(struct sr_boot_volume *, int, daddr_t, size_t,
void *, size_t *);
#endif /* _SOFTRAID_I386_H */
diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c
index f8940a2e0dc..81f0b6673b2 100644
--- a/sys/arch/i386/stand/pxeboot/conf.c
+++ b/sys/arch/i386/stand/pxeboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.47 2020/06/14 16:06:25 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.48 2020/12/09 18:10:18 krw Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -45,7 +45,7 @@
#include "pxeboot.h"
#include "pxe_net.h"
-const char version[] = "3.43";
+const char version[] = "3.44";
int debug = 1;
void (*sa_cleanup)(void) = pxe_shutdown;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 23:22:58 +0000