Use <stdint.h> types.

ok mpi@, jung@, krw@, deraadt@

17 files changed, 370 insertions, 370 deletions

diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index cddd7350c5b..8a4ee6657cb 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.348 2018/06/29 04:55:55 mlarkin Exp $ */
+/* $OpenBSD: acpi.c,v 1.349 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -295,7 +295,7 @@ int
 acpi_gasio(struct acpi_softc *sc, int iodir, int iospace, uint64_t address,
     int access_size, int len, void *buffer)
 {
-	u_int8_t *pb;
+	uint8_t *pb;
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh;
 	pci_chipset_tag_t pc;
@@ -307,7 +307,7 @@ acpi_gasio(struct acpi_softc *sc, int iodir, int iospace, uint64_t address,
 
 	KASSERT((len % access_size) == 0);
 
-	pb = (u_int8_t *)buffer;
+	pb = (uint8_t *)buffer;
 	switch (iospace) {
 	case GAS_SYSTEM_MEMORY:
 	case GAS_SYSTEM_IOSPACE:
@@ -449,9 +449,9 @@ acpi_gasio(struct acpi_softc *sc, int iodir, int iospace, uint64_t address,
 			return (-1);
 		}
 		if (iodir == ACPI_IOREAD)
-			acpiec_read(sc->sc_ec, (u_int8_t)address, len, buffer);
+			acpiec_read(sc->sc_ec, (uint8_t)address, len, buffer);
 		else
-			acpiec_write(sc->sc_ec, (u_int8_t)address, len, buffer);
+			acpiec_write(sc->sc_ec, (uint8_t)address, len, buffer);
 		break;
 	}
 	return (0);
@@ -1904,8 +1904,8 @@ acpi_sleep_task(void *arg0, int sleepmode)
 void
 acpi_reset(void)
 {
-	u_int32_t		 reset_as, reset_len;
-	u_int32_t		 value;
+	uint32_t		 reset_as, reset_len;
+	uint32_t		 value;
 	struct acpi_softc	*sc = acpi_softc;
 	struct acpi_fadt	*fadt = sc->sc_fadt;
 
@@ -2002,8 +2002,8 @@ int
 acpi_interrupt(void *arg)
 {
 	struct acpi_softc *sc = (struct acpi_softc *)arg;
-	u_int32_t processed = 0, idx, jdx;
-	u_int16_t sts, en;
+	uint32_t processed = 0, idx, jdx;
+	uint16_t sts, en;
 
 	dnprintf(40, "ACPI Interrupt\n");
 	for (idx = 0; idx < sc->sc_lastgpe; idx += 8) {
@@ -2398,7 +2398,7 @@ acpi_sleep_pm(struct acpi_softc *sc, int state)
 	}
 }
 
-u_int32_t acpi_force_bm;
+uint32_t acpi_force_bm;
 
 void
 acpi_resume_pm(struct acpi_softc *sc, int fromstate)
diff --git a/sys/dev/acpi/acpicpu.c b/sys/dev/acpi/acpicpu.c
index 9f049424fe3..c3ee56ba874 100644
--- a/sys/dev/acpi/acpicpu.c
+++ b/sys/dev/acpi/acpicpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpicpu.c,v 1.81 2017/11/30 00:21:42 guenther Exp $ */
+/* $OpenBSD: acpicpu.c,v 1.82 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
@@ -110,7 +110,7 @@ struct acpi_cstate
 	u_short		flags;		/* CST_FLAG_* */
 	u_short		latency;
 	int		power;
-	u_int64_t	address;	/* or mwait hint */
+	uint64_t	address;	/* or mwait hint */
 };
 
 unsigned long cst_stats[4] = { 0 };
@@ -121,7 +121,7 @@ struct acpicpu_softc {
 
 	int			sc_duty_wid;
 	int			sc_duty_off;
-	u_int32_t		sc_pblk_addr;
+	uint32_t		sc_pblk_addr;
 	int			sc_pblk_len;
 	int			sc_flags;
 	unsigned long		sc_prev_sleep;
@@ -144,10 +144,10 @@ struct acpicpu_softc {
 
 	struct acpicpu_pct	sc_pct;
 	/* save compensation for pct access for lying bios' */
-	u_int32_t		sc_pct_stat_as;
-	u_int32_t		sc_pct_ctrl_as;
-	u_int32_t		sc_pct_stat_len;
-	u_int32_t		sc_pct_ctrl_len;
+	uint32_t		sc_pct_stat_as;
+	uint32_t		sc_pct_ctrl_as;
+	uint32_t		sc_pct_stat_len;
+	uint32_t		sc_pct_ctrl_len;
 	/*
 	 * XXX: _PPC Change listener
 	 * PPC changes can occur when for example a machine is disconnected
@@ -169,7 +169,7 @@ void	acpicpu_getcst_from_fadt(struct acpicpu_softc *);
 void	acpicpu_print_one_cst(struct acpi_cstate *_cx);
 void	acpicpu_print_cst(struct acpicpu_softc *_sc);
 void	acpicpu_add_cstate(struct acpicpu_softc *_sc, int _state, int _method,
-	    int _flags, int _latency, int _power, u_int64_t _address);
+	    int _flags, int _latency, int _power, uint64_t _address);
 void	acpicpu_set_pdc(struct acpicpu_softc *);
 void	acpicpu_idle(void);
 
@@ -339,7 +339,7 @@ check_mwait_hints(int state, int hints)
 
 void
 acpicpu_add_cstate(struct acpicpu_softc *sc, int state, int method,
-    int flags, int latency, int power, u_int64_t address)
+    int flags, int latency, int power, uint64_t address)
 {
 	struct acpi_cstate	*cx;
 
@@ -367,7 +367,7 @@ void
 acpicpu_add_cstatepkg(struct aml_value *val, void *arg)
 {
 	struct acpicpu_softc	*sc = arg;
-	u_int64_t addr;
+	uint64_t addr;
 	struct acpi_grd *grd;
 	int state, method, flags;
 
@@ -670,7 +670,7 @@ acpicpu_attach(struct device *parent, struct device *self, void *aux)
 	struct acpi_attach_args *aa = aux;
 	struct aml_value	res;
 	int			i;
-	u_int32_t		status = 0;
+	uint32_t		status = 0;
 	CPU_INFO_ITERATOR	cii;
 	struct cpu_info		*ci;
 
@@ -729,7 +729,7 @@ acpicpu_attach(struct device *parent, struct device *self, void *aux)
 		}
 	}
 	if (!SLIST_EMPTY(&sc->sc_cstates)) {
-		extern u_int32_t acpi_force_bm;
+		extern uint32_t acpi_force_bm;
 
 		cpu_idle_cycle_fcn = &acpicpu_idle;
 
@@ -1050,7 +1050,7 @@ acpicpu_setperf(int level)
 	struct acpicpu_softc	*sc;
 	struct acpicpu_pss	*pss = NULL;
 	int			idx, len;
-	u_int32_t		status = 0;
+	uint32_t		status = 0;
 
 	sc = acpicpu_sc[cpu_number()];
 
diff --git a/sys/dev/acpi/acpidebug.c b/sys/dev/acpi/acpidebug.c
index f997be1f428..3f8b789bce8 100644
--- a/sys/dev/acpi/acpidebug.c
+++ b/sys/dev/acpi/acpidebug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpidebug.c,v 1.30 2015/03/14 03:38:46 jsg Exp $ */
+/* $OpenBSD: acpidebug.c,v 1.31 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@openbsd.org>
  *
@@ -42,7 +42,7 @@ extern void aml_disasm(struct aml_scope *scope, int lvl,
 const char		*db_aml_objtype(struct aml_value *);
 const char		*db_opregion(int);
 int			db_parse_name(void);
-void			db_aml_dump(int, u_int8_t *);
+void			db_aml_dump(int, uint8_t *);
 void			db_aml_showvalue(struct aml_value *);
 void			db_aml_walktree(struct aml_node *);
 void			db_disprint(void *, const char *, ...);
@@ -78,7 +78,7 @@ db_opregion(int id)
 	return "";
 }
 void
-db_aml_dump(int len, u_int8_t *buf)
+db_aml_dump(int len, uint8_t *buf)
 {
 	int		idx;
 
diff --git a/sys/dev/acpi/acpidev.h b/sys/dev/acpi/acpidev.h
index 077a29ee046..512d79b762b 100644
--- a/sys/dev/acpi/acpidev.h
+++ b/sys/dev/acpi/acpidev.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpidev.h,v 1.43 2018/01/17 07:40:29 bentley Exp $ */
+/* $OpenBSD: acpidev.h,v 1.44 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
@@ -78,27 +78,27 @@
  * }
  */
 struct acpibat_bix {
-	u_int8_t	bix_revision;
-	u_int32_t	bix_power_unit;
+	uint8_t		bix_revision;
+	uint32_t	bix_power_unit;
 #define BIX_POWER_MW		0x00
 #define BIX_POWER_MA		0x01
-	u_int32_t	bix_capacity;
+	uint32_t	bix_capacity;
 #define BIX_UNKNOWN		0xffffffff
-	u_int32_t	bix_last_capacity;
-	u_int32_t	bix_technology;
+	uint32_t	bix_last_capacity;
+	uint32_t	bix_technology;
 #define BIX_TECH_PRIMARY	0x00
 #define BIX_TECH_SECONDARY	0x01
-	u_int32_t	bix_voltage;
-	u_int32_t	bix_warning;
-	u_int32_t	bix_low;
-	u_int32_t	bix_cycle_count;
-	u_int32_t	bix_accuracy;
-	u_int32_t	bix_max_sample;
-	u_int32_t	bix_min_sample;
-	u_int32_t	bix_max_avg;
-	u_int32_t	bix_min_avg;
-	u_int32_t	bix_cap_granu1;
-	u_int32_t	bix_cap_granu2;
+	uint32_t	bix_voltage;
+	uint32_t	bix_warning;
+	uint32_t	bix_low;
+	uint32_t	bix_cycle_count;
+	uint32_t	bix_accuracy;
+	uint32_t	bix_max_sample;
+	uint32_t	bix_min_sample;
+	uint32_t	bix_max_avg;
+	uint32_t	bix_min_avg;
+	uint32_t	bix_cap_granu1;
+	uint32_t	bix_cap_granu2;
 	char		bix_model[20];
 	char		bix_serial[20];
 	char		bix_type[20];
@@ -133,14 +133,14 @@ struct acpibat_bix {
  *     Battery Present Rate [=0xFFFFFFFF] = unknown
  */
 struct acpibat_bst {
-	u_int32_t	bst_state;
+	uint32_t	bst_state;
 #define BST_DISCHARGE		0x01
 #define BST_CHARGE		0x02
 #define BST_CRITICAL		0x04
-	u_int32_t	bst_rate;
+	uint32_t	bst_rate;
 #define BST_UNKNOWN		0xffffffff
-	u_int32_t	bst_capacity;
-	u_int32_t	bst_voltage;
+	uint32_t	bst_capacity;
+	uint32_t	bst_voltage;
 };
 
 /*
@@ -174,23 +174,23 @@ struct acpibat_bst {
  * }
  */
 struct acpibat_bmd {
-	u_int32_t	bmd_status;
+	uint32_t	bmd_status;
 #define BMD_AML_CALIBRATE_CYCLE	0x01
 #define BMD_CHARGING_DISABLED	0x02
 #define BMD_DISCHARGE_WHILE_AC	0x04
 #define BMD_RECALIBRATE_BAT	0x08
 #define BMD_GOTO_STANDBY_SPEED	0x10
-	u_int32_t	bmd_capability;
+	uint32_t	bmd_capability;
 #define BMD_CB_AML_CALIBRATION	0x01
 #define BMD_CB_DISABLE_CHARGER	0x02
 #define BMD_CB_DISCH_WHILE_AC	0x04
 #define BMD_CB_AFFECT_ALL_BATT	0x08
 #define BMD_CB_FULL_CHRG_FIRST	0x10
-	u_int32_t	bmd_recalibrate_count;
+	uint32_t	bmd_recalibrate_count;
 #define BMD_ONLY_CALIB_IF_ST3	0x00	/* only recal when status bit 3 set */
-	u_int32_t	bmd_quick_recalibrate_time;
+	uint32_t	bmd_quick_recalibrate_time;
 #define BMD_UNKNOWN		0xffffffff
-	u_int32_t	bmd_slow_recalibrate_time;
+	uint32_t	bmd_slow_recalibrate_time;
 };
 
 /*
@@ -257,12 +257,12 @@ struct acpibat_bmd {
  * }
  */
 struct acpicpu_pss {
-	u_int32_t	pss_core_freq;
-	u_int32_t	pss_power;
-	u_int32_t	pss_trans_latency;
-	u_int32_t	pss_bus_latency;
-	u_int32_t	pss_ctrl;
-	u_int32_t	pss_status;
+	uint32_t	pss_core_freq;
+	uint32_t	pss_power;
+	uint32_t	pss_trans_latency;
+	uint32_t	pss_bus_latency;
+	uint32_t	pss_ctrl;
+	uint32_t	pss_status;
 };
 
 int acpicpu_fetch_pss(struct acpicpu_pss **);
@@ -274,8 +274,8 @@ void acpicpu_set_notify(void (*)(struct acpicpu_pss *, int));
  *
  */
 struct acpi_grd {
-	u_int8_t	grd_descriptor;
-	u_int16_t	grd_length;
+	uint8_t		grd_descriptor;
+	uint16_t	grd_length;
 	struct acpi_gas	grd_gas;
 } __packed;
 
@@ -370,7 +370,7 @@ struct acpiec_softc {
 
 	struct acpi_softc	*sc_acpi;
 	struct aml_node		*sc_devnode;
-	u_int32_t		sc_gpe;
+	uint32_t		sc_gpe;
 	struct acpiec_event	sc_events[ACPIEC_MAX_EVENTS];
 	int			sc_gotsci;
 	int			sc_glk;
diff --git a/sys/dev/acpi/acpiec.c b/sys/dev/acpi/acpiec.c
index ecf0f3f7f99..d9f2f54e480 100644
--- a/sys/dev/acpi/acpiec.c
+++ b/sys/dev/acpi/acpiec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiec.c,v 1.57 2018/01/17 07:40:29 bentley Exp $ */
+/* $OpenBSD: acpiec.c,v 1.58 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>
  *
@@ -33,24 +33,24 @@
 int		acpiec_match(struct device *, void *, void *);
 void		acpiec_attach(struct device *, struct device *, void *);
 
-u_int8_t	acpiec_status(struct acpiec_softc *);
-u_int8_t	acpiec_read_data(struct acpiec_softc *);
-void		acpiec_write_cmd(struct acpiec_softc *, u_int8_t);
-void		acpiec_write_data(struct acpiec_softc *, u_int8_t);
+uint8_t		acpiec_status(struct acpiec_softc *);
+uint8_t		acpiec_read_data(struct acpiec_softc *);
+void		acpiec_write_cmd(struct acpiec_softc *, uint8_t);
+void		acpiec_write_data(struct acpiec_softc *, uint8_t);
 void		acpiec_burst_enable(struct acpiec_softc *sc);
 void		acpiec_burst_disable(struct acpiec_softc *sc);
 
-u_int8_t	acpiec_read_1(struct acpiec_softc *, u_int8_t);
-void		acpiec_write_1(struct acpiec_softc *, u_int8_t, u_int8_t);
+uint8_t		acpiec_read_1(struct acpiec_softc *, uint8_t);
+void		acpiec_write_1(struct acpiec_softc *, uint8_t, uint8_t);
 
-void		acpiec_read(struct acpiec_softc *, u_int8_t, int, u_int8_t *);
-void		acpiec_write(struct acpiec_softc *, u_int8_t, int, u_int8_t *);
+void		acpiec_read(struct acpiec_softc *, uint8_t, int, uint8_t *);
+void		acpiec_write(struct acpiec_softc *, uint8_t, int, uint8_t *);
 
 int		acpiec_getcrs(struct acpiec_softc *,
 		    struct acpi_attach_args *);
 int		acpiec_parse_resources(int, union acpi_resource *, void *);
 
-void		acpiec_wait(struct acpiec_softc *, u_int8_t, u_int8_t);
+void		acpiec_wait(struct acpiec_softc *, uint8_t, uint8_t);
 void		acpiec_sci_event(struct acpiec_softc *);
 
 void		acpiec_get_events(struct acpiec_softc *);
@@ -90,10 +90,10 @@ struct cfdriver acpiec_cd = {
 const char *acpiec_hids[] = { ACPI_DEV_ECD, 0 };
 
 void
-acpiec_wait(struct acpiec_softc *sc, u_int8_t mask, u_int8_t val)
+acpiec_wait(struct acpiec_softc *sc, uint8_t mask, uint8_t val)
 {
 	static int acpiecnowait;
-	u_int8_t		stat;
+	uint8_t		stat;
 
 	dnprintf(40, "%s: EC wait_ns for: %b == %02x\n",
 	    DEVNAME(sc), (int)mask,
@@ -112,14 +112,14 @@ acpiec_wait(struct acpiec_softc *sc, u_int8_t mask, u_int8_t val)
 	    "\20\x8IGN\x7SMI\x6SCI\05BURST\04CMD\03IGN\02IBF\01OBF");
 }
 
-u_int8_t
+uint8_t
 acpiec_status(struct acpiec_softc *sc)
 {
 	return (bus_space_read_1(sc->sc_cmd_bt, sc->sc_cmd_bh, 0));
 }
 
 void
-acpiec_write_data(struct acpiec_softc *sc, u_int8_t val)
+acpiec_write_data(struct acpiec_softc *sc, uint8_t val)
 {
 	acpiec_wait(sc, EC_STAT_IBF, 0);
 	dnprintf(40, "acpiec: write_data -- %d\n", (int)val);
@@ -127,17 +127,17 @@ acpiec_write_data(struct acpiec_softc *sc, u_int8_t val)
 }
 
 void
-acpiec_write_cmd(struct acpiec_softc *sc, u_int8_t val)
+acpiec_write_cmd(struct acpiec_softc *sc, uint8_t val)
 {
 	acpiec_wait(sc, EC_STAT_IBF, 0);
 	dnprintf(40, "acpiec: write_cmd -- %d\n", (int)val);
 	bus_space_write_1(sc->sc_cmd_bt, sc->sc_cmd_bh, 0, val);
 }
 
-u_int8_t
+uint8_t
 acpiec_read_data(struct acpiec_softc *sc)
 {
-	u_int8_t		val;
+	uint8_t		val;
 
 	acpiec_wait(sc, EC_STAT_OBF, EC_STAT_OBF);
 	val = bus_space_read_1(sc->sc_data_bt, sc->sc_data_bh, 0);
@@ -150,7 +150,7 @@ acpiec_read_data(struct acpiec_softc *sc)
 void
 acpiec_sci_event(struct acpiec_softc *sc)
 {
-	u_int8_t		evt;
+	uint8_t		evt;
 
 	sc->sc_gotsci = 0;
 
@@ -167,10 +167,10 @@ acpiec_sci_event(struct acpiec_softc *sc)
 	}
 }
 
-u_int8_t
-acpiec_read_1(struct acpiec_softc *sc, u_int8_t addr)
+uint8_t
+acpiec_read_1(struct acpiec_softc *sc, uint8_t addr)
 {
-	u_int8_t		val;
+	uint8_t		val;
 
 	if ((acpiec_status(sc) & EC_STAT_SCI_EVT) == EC_STAT_SCI_EVT)
 		sc->sc_gotsci = 1;
@@ -184,7 +184,7 @@ acpiec_read_1(struct acpiec_softc *sc, u_int8_t addr)
 }
 
 void
-acpiec_write_1(struct acpiec_softc *sc, u_int8_t addr, u_int8_t data)
+acpiec_write_1(struct acpiec_softc *sc, uint8_t addr, uint8_t data)
 {
 	if ((acpiec_status(sc) & EC_STAT_SCI_EVT) == EC_STAT_SCI_EVT)
 		sc->sc_gotsci = 1;
@@ -215,7 +215,7 @@ acpiec_burst_disable(struct acpiec_softc *sc)
 }
 
 void
-acpiec_read(struct acpiec_softc *sc, u_int8_t addr, int len, u_int8_t *buffer)
+acpiec_read(struct acpiec_softc *sc, uint8_t addr, int len, uint8_t *buffer)
 {
 	int			reg;
 
@@ -234,7 +234,7 @@ acpiec_read(struct acpiec_softc *sc, u_int8_t addr, int len, u_int8_t *buffer)
 }
 
 void
-acpiec_write(struct acpiec_softc *sc, u_int8_t addr, int len, u_int8_t *buffer)
+acpiec_write(struct acpiec_softc *sc, uint8_t addr, int len, uint8_t *buffer)
 {
 	int			reg;
 
@@ -349,7 +349,7 @@ int
 acpiec_gpehandler(struct acpi_softc *acpi_sc, int gpe, void *arg)
 {
 	struct acpiec_softc	*sc = arg;
-	u_int8_t		mask, stat, en;
+	uint8_t			mask, stat, en;
 	int			s;
 
 	KASSERT(sc->sc_ecbusy == 0);
diff --git a/sys/dev/acpi/acpihpet.c b/sys/dev/acpi/acpihpet.c
index f3c0819dfd0..d0ee72cec9b 100644
--- a/sys/dev/acpi/acpihpet.c
+++ b/sys/dev/acpi/acpihpet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpihpet.c,v 1.22 2017/10/06 13:33:53 mikeb Exp $ */
+/* $OpenBSD: acpihpet.c,v 1.23 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -34,10 +34,10 @@ int acpihpet_activate(struct device *, int);
 
 u_int acpihpet_gettime(struct timecounter *tc);
 
-u_int64_t	acpihpet_r(bus_space_tag_t _iot, bus_space_handle_t _ioh,
+uint64_t	acpihpet_r(bus_space_tag_t _iot, bus_space_handle_t _ioh,
 		    bus_size_t _ioa);
 void		acpihpet_w(bus_space_tag_t _iot, bus_space_handle_t _ioh,
-		    bus_size_t _ioa, u_int64_t _val);
+		    bus_size_t _ioa, uint64_t _val);
 
 static struct timecounter hpet_timecounter = {
 	acpihpet_gettime,	/* get_timecount */
@@ -50,13 +50,13 @@ static struct timecounter hpet_timecounter = {
 
 #define HPET_TIMERS	3
 struct hpet_regs {
-	u_int64_t	configuration;
-	u_int64_t	interrupt_status;
-	u_int64_t	main_counter;
+	uint64_t	configuration;
+	uint64_t	interrupt_status;
+	uint64_t	main_counter;
 	struct {	/* timers */
-		u_int64_t config;
-		u_int64_t compare;
-		u_int64_t interrupt;
+		uint64_t config;
+		uint64_t compare;
+		uint64_t interrupt;
 	} timers[HPET_TIMERS];
 };
 
@@ -66,7 +66,7 @@ struct acpihpet_softc {
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 
-	u_int32_t		sc_conf;
+	uint32_t		sc_conf;
 	struct hpet_regs	sc_save;
 };
 
@@ -79,10 +79,10 @@ struct cfdriver acpihpet_cd = {
 	NULL, "acpihpet", DV_DULL
 };
 
-u_int64_t
+uint64_t
 acpihpet_r(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t ioa)
 {
-	u_int64_t val;
+	uint64_t val;
 
 	val = bus_space_read_4(iot, ioh, ioa + 4);
 	val = val << 32;
@@ -92,7 +92,7 @@ acpihpet_r(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t ioa)
 
 void
 acpihpet_w(bus_space_tag_t iot, bus_space_handle_t ioh, bus_size_t ioa,
-    u_int64_t val)
+    uint64_t val)
 {
 	bus_space_write_4(iot, ioh, ioa + 4, val >> 32);
 	bus_space_write_4(iot, ioh, ioa, val & 0xffffffff);
@@ -200,8 +200,8 @@ acpihpet_attach(struct device *parent, struct device *self, void *aux)
 	struct acpi_softc *psc = (struct acpi_softc *)parent;
 	struct acpi_attach_args *aaa = aux;
 	struct acpi_hpet *hpet = (struct acpi_hpet *)aaa->aaa_table;
-	u_int64_t period, freq;	/* timer period in femtoseconds (10^-15) */
-	u_int32_t v1, v2;
+	uint64_t period, freq;	/* timer period in femtoseconds (10^-15) */
+	uint32_t v1, v2;
 	int timeout;
 
 	if (acpi_map_address(psc, &hpet->base_address, 0, HPET_REG_SIZE,
@@ -248,7 +248,7 @@ acpihpet_attach(struct device *parent, struct device *self, void *aux)
 	}
 
 	period = bus_space_read_4(sc->sc_iot, sc->sc_ioh,
-	    HPET_CAPABILITIES + sizeof(u_int32_t));
+	    HPET_CAPABILITIES + sizeof(uint32_t));
 
 	/* Period must be > 0 and less than 100ns (10^8 fs) */
 	if (period == 0 || period > HPET_MAX_PERIOD) {
@@ -260,7 +260,7 @@ acpihpet_attach(struct device *parent, struct device *self, void *aux)
 	freq = 1000000000000000ull / period;
 	printf(": %lld Hz\n", freq);
 
-	hpet_timecounter.tc_frequency = (u_int32_t)freq;
+	hpet_timecounter.tc_frequency = (uint32_t)freq;
 	hpet_timecounter.tc_priv = sc;
 	hpet_timecounter.tc_name = sc->sc_dev.dv_xname;
 	tc_init(&hpet_timecounter);
diff --git a/sys/dev/acpi/acpimadt.c b/sys/dev/acpi/acpimadt.c
index c783928d66f..2ff559c7287 100644
--- a/sys/dev/acpi/acpimadt.c
+++ b/sys/dev/acpi/acpimadt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpimadt.c,v 1.36 2016/09/17 20:20:25 guenther Exp $ */
+/* $OpenBSD: acpimadt.c,v 1.37 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -52,7 +52,7 @@ struct cfdriver acpimadt_cd = {
 };
 
 int acpimadt_validate(struct acpi_madt *);
-int acpimadt_cfg_intr(int, u_int32_t *);
+int acpimadt_cfg_intr(int, uint32_t *);
 int acpimadt_print(void *, const char *);
 
 int
@@ -84,7 +84,7 @@ acpimadt_validate(struct acpi_madt *madt)
 
 	while (addr < (caddr_t)madt + madt->hdr.length) {
 		union acpi_madt_entry *entry = (union acpi_madt_entry *)addr;
-		u_int8_t length = entry->madt_lapic.length;
+		uint8_t length = entry->madt_lapic.length;
 
 		if (length < 2)
 			return (0);
@@ -149,7 +149,7 @@ struct mp_bus acpimadt_busses[256];
 struct mp_bus acpimadt_isa_bus;
 
 int
-acpimadt_cfg_intr(int flags, u_int32_t *redir)
+acpimadt_cfg_intr(int flags, uint32_t *redir)
 {
 	int mpspo = (flags >> MPS_INTPO_SHIFT) & MPS_INTPO_MASK;
 	int mpstrig = (flags >> MPS_INTTR_SHIFT) & MPS_INTTR_MASK;
@@ -184,7 +184,7 @@ acpimadt_cfg_intr(int flags, u_int32_t *redir)
 	return (1);
 }
 
-static u_int8_t lapic_map[256];
+static uint8_t lapic_map[256];
 
 void
 acpimadt_attach(struct device *parent, struct device *self, void *aux)
diff --git a/sys/dev/acpi/acpireg.h b/sys/dev/acpi/acpireg.h
index 5b1e145e82c..163d0f6102b 100644
--- a/sys/dev/acpi/acpireg.h
+++ b/sys/dev/acpi/acpireg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpireg.h,v 1.40 2018/03/14 18:52:16 patrick Exp $	*/
+/*	$OpenBSD: acpireg.h,v 1.41 2018/06/29 17:39:18 kettenis Exp $	*/
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
@@ -21,16 +21,16 @@
 
 /*	Root System Descriptor Pointer */
 struct acpi_rsdp1 {
-	u_int8_t	signature[8];
+	uint8_t		signature[8];
 #define	RSDP_SIG	"RSD PTR "
 #define	rsdp_signaturee	rsdp1.signature
-	u_int8_t	checksum;	/* make sum == 0 */
+	uint8_t		checksum;	/* make sum == 0 */
 #define	rsdp_checksum	rsdp1.checksum
-	u_int8_t	oemid[6];
+	uint8_t		oemid[6];
 #define	rsdp_oemid	rsdp1.oemid
-	u_int8_t	revision;	/* 0 for 1, 2 for 2 */
+	uint8_t		revision;	/* 0 for 1, 2 for 2 */
 #define	rsdp_revision	rsdp1.revision
-	u_int32_t	rsdt;		/* physical */
+	uint32_t	rsdt;		/* physical */
 #define	rsdp_rsdt	rsdp1.rsdt
 } __packed;
 
@@ -40,73 +40,73 @@ struct acpi_rsdp {
 	 * The following values are only valid
 	 * when rsdp_revision == 2
 	 */
-	u_int32_t	rsdp_length;		/* length of rsdp */
-	u_int64_t	rsdp_xsdt;		/* physical */
-	u_int8_t	rsdp_extchecksum;	/* entire table */
-	u_int8_t	rsdp_reserved[3];	/* must be zero */
+	uint32_t	rsdp_length;		/* length of rsdp */
+	uint64_t	rsdp_xsdt;		/* physical */
+	uint8_t		rsdp_extchecksum;	/* entire table */
+	uint8_t		rsdp_reserved[3];	/* must be zero */
 } __packed;
 
 struct acpi_table_header {
-	u_int8_t	signature[4];
+	uint8_t		signature[4];
 #define	hdr_signature		hdr.signature
-	u_int32_t	length;
+	uint32_t	length;
 #define	hdr_length		hdr.length
-	u_int8_t	revision;
+	uint8_t		revision;
 #define	hdr_revision		hdr.revision
-	u_int8_t	checksum;
+	uint8_t		checksum;
 #define	hdr_checksum		hdr.checksum
-	u_int8_t	oemid[6];
+	uint8_t		oemid[6];
 #define hdr_oemid		hdr.oemid
-	u_int8_t	oemtableid[8];
+	uint8_t		oemtableid[8];
 #define hdr_oemtableid		hdr.oemtableid
-	u_int32_t	oemrevision;
+	uint32_t	oemrevision;
 #define	hdr_oemrevision		hdr.oemrevision
-	u_int8_t	aslcompilerid[4];
+	uint8_t		aslcompilerid[4];
 #define hdr_aslcompilerid	hdr.aslcompilerid
-	u_int32_t	aslcompilerrevision;
+	uint32_t	aslcompilerrevision;
 #define	hdr_aslcompilerrevision	hdr.aslcompilerrevision
 } __packed;
 
 struct acpi_rsdt {
 	struct acpi_table_header	hdr;
 #define RSDT_SIG	"RSDT"
-	u_int32_t			table_offsets[1];
+	uint32_t			table_offsets[1];
 } __packed;
 
 struct acpi_xsdt {
 	struct acpi_table_header	hdr;
 #define XSDT_SIG	"XSDT"
-	u_int64_t			table_offsets[1];
+	uint64_t			table_offsets[1];
 } __packed;
 
 struct acpi_gas {
-	u_int8_t	address_space_id;
+	uint8_t		address_space_id;
 #define GAS_SYSTEM_MEMORY	0
 #define GAS_SYSTEM_IOSPACE	1
 #define GAS_PCI_CFG_SPACE	2
 #define GAS_EMBEDDED		3
 #define GAS_SMBUS		4
 #define GAS_FUNCTIONAL_FIXED	127
-	u_int8_t	register_bit_width;
-	u_int8_t	register_bit_offset;
-	u_int8_t	access_size;
+	uint8_t		register_bit_width;
+	uint8_t		register_bit_offset;
+	uint8_t		access_size;
 #define GAS_ACCESS_UNDEFINED	0
 #define GAS_ACCESS_BYTE		1
 #define GAS_ACCESS_WORD		2
 #define GAS_ACCESS_DWORD	3
 #define GAS_ACCESS_QWORD	4
-	u_int64_t	address;
+	uint64_t	address;
 } __packed;
 
 struct acpi_fadt {
 	struct acpi_table_header	hdr;
 #define	FADT_SIG	"FACP"
-	u_int32_t	firmware_ctl;	/* phys addr FACS */
-	u_int32_t	dsdt;		/* phys addr DSDT */
-	u_int8_t	int_model;	/* interrupt model (hdr_revision < 3) */
+	uint32_t	firmware_ctl;	/* phys addr FACS */
+	uint32_t	dsdt;		/* phys addr DSDT */
+	uint8_t		int_model;	/* interrupt model (hdr_revision < 3) */
 #define	FADT_INT_DUAL_PIC	0
 #define	FADT_INT_MULTI_APIC	1
-	u_int8_t	pm_profile;	/* power mgmt profile */
+	uint8_t		pm_profile;	/* power mgmt profile */
 #define	FADT_PM_UNSPEC		0
 #define	FADT_PM_DESKTOP		1
 #define	FADT_PM_MOBILE		2
@@ -115,43 +115,43 @@ struct acpi_fadt {
 #define	FADT_PM_SOHO_SERVER	5
 #define	FADT_PM_APPLIANCE	6
 #define	FADT_PM_PERF_SERVER	7
-	u_int16_t	sci_int;	/* SCI interrupt */
-	u_int32_t	smi_cmd;	/* SMI command port */
-	u_int8_t	acpi_enable;	/* value to enable */
-	u_int8_t	acpi_disable;	/* value to disable */
-	u_int8_t	s4bios_req;	/* value for S4 */
-	u_int8_t	pstate_cnt;	/* value for performance (hdr_revision > 2) */
-	u_int32_t	pm1a_evt_blk;	/* power management 1a */
-	u_int32_t	pm1b_evt_blk;	/* power mangement 1b */
-	u_int32_t	pm1a_cnt_blk;	/* pm control 1a */
-	u_int32_t	pm1b_cnt_blk;	/* pm control 1b */
-	u_int32_t	pm2_cnt_blk;	/* pm control 2 */
-	u_int32_t	pm_tmr_blk;
-	u_int32_t	gpe0_blk;
-	u_int32_t	gpe1_blk;
-	u_int8_t	pm1_evt_len;
-	u_int8_t	pm1_cnt_len;
-	u_int8_t	pm2_cnt_len;
-	u_int8_t	pm_tmr_len;
-	u_int8_t	gpe0_blk_len;
-	u_int8_t	gpe1_blk_len;
-	u_int8_t	gpe1_base;
-	u_int8_t	cst_cnt;	/* (hdr_revision > 2) */
-	u_int16_t	p_lvl2_lat;
-	u_int16_t	p_lvl3_lat;
-	u_int16_t	flush_size;
-	u_int16_t	flush_stride;
-	u_int8_t	duty_offset;
-	u_int8_t	duty_width;
-	u_int8_t	day_alrm;
-	u_int8_t	mon_alrm;
-	u_int8_t	century;
-	u_int16_t	iapc_boot_arch;	/* (hdr_revision > 2) */
+	uint16_t	sci_int;	/* SCI interrupt */
+	uint32_t	smi_cmd;	/* SMI command port */
+	uint8_t		acpi_enable;	/* value to enable */
+	uint8_t		acpi_disable;	/* value to disable */
+	uint8_t		s4bios_req;	/* value for S4 */
+	uint8_t		pstate_cnt;	/* value for performance (hdr_revision > 2) */
+	uint32_t	pm1a_evt_blk;	/* power management 1a */
+	uint32_t	pm1b_evt_blk;	/* power mangement 1b */
+	uint32_t	pm1a_cnt_blk;	/* pm control 1a */
+	uint32_t	pm1b_cnt_blk;	/* pm control 1b */
+	uint32_t	pm2_cnt_blk;	/* pm control 2 */
+	uint32_t	pm_tmr_blk;
+	uint32_t	gpe0_blk;
+	uint32_t	gpe1_blk;
+	uint8_t		pm1_evt_len;
+	uint8_t		pm1_cnt_len;
+	uint8_t		pm2_cnt_len;
+	uint8_t		pm_tmr_len;
+	uint8_t		gpe0_blk_len;
+	uint8_t		gpe1_blk_len;
+	uint8_t		gpe1_base;
+	uint8_t		cst_cnt;	/* (hdr_revision > 2) */
+	uint16_t	p_lvl2_lat;
+	uint16_t	p_lvl3_lat;
+	uint16_t	flush_size;
+	uint16_t	flush_stride;
+	uint8_t		duty_offset;
+	uint8_t		duty_width;
+	uint8_t		day_alrm;
+	uint8_t		mon_alrm;
+	uint8_t		century;
+	uint16_t	iapc_boot_arch;	/* (hdr_revision > 2) */
 #define	FADT_LEGACY_DEVICES		0x0001	/* Legacy devices supported */
 #define	FADT_i8042			0x0002	/* Keyboard controller present */
 #define	FADT_NO_VGA			0x0004	/* Do not probe VGA */
-	u_int8_t	reserved1;
-	u_int32_t	flags;
+	uint8_t		reserved1;
+	uint32_t	flags;
 #define	FADT_WBINVD			0x00000001
 #define	FADT_WBINVD_FLUSH		0x00000002
 #define	FADT_PROC_C1			0x00000004
@@ -181,12 +181,12 @@ struct acpi_fadt {
 	 * extended values above
 	 */
 	struct acpi_gas	reset_reg;
-	u_int8_t	reset_value;
-	u_int8_t	reserved2a;
-	u_int8_t	reserved2b;
-	u_int8_t	reserved2c;
-	u_int64_t	x_firmware_ctl;
-	u_int64_t	x_dsdt;
+	uint8_t		reset_value;
+	uint8_t		reserved2a;
+	uint8_t		reserved2b;
+	uint8_t		reserved2c;
+	uint64_t	x_firmware_ctl;
+	uint64_t	x_dsdt;
 	struct acpi_gas	x_pm1a_evt_blk;
 	struct acpi_gas	x_pm1b_evt_blk;
 	struct acpi_gas	x_pm1a_cnt_blk;
@@ -202,13 +202,13 @@ struct acpi_fadt {
 struct acpi_dsdt {
 	struct acpi_table_header	hdr;
 #define DSDT_SIG	"DSDT"
-	u_int8_t	aml[1];
+	uint8_t		aml[1];
 } __packed;
 
 struct acpi_ssdt {
 	struct acpi_table_header	hdr;
 #define SSDT_SIG	"SSDT"
-	u_int8_t	aml[1];
+	uint8_t		aml[1];
 } __packed;
 
 /*
@@ -222,40 +222,40 @@ struct acpi_psdt {
 struct acpi_madt {
 	struct acpi_table_header	hdr;
 #define MADT_SIG	"APIC"
-	u_int32_t	local_apic_address;
-	u_int32_t	flags;
+	uint32_t	local_apic_address;
+	uint32_t	flags;
 #define ACPI_APIC_PCAT_COMPAT	0x00000001
 } __packed;
 
 struct acpi_madt_lapic {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_LAPIC		0
-	u_int8_t	length;
-	u_int8_t	acpi_proc_id;
-	u_int8_t	apic_id;
-	u_int32_t	flags;
+	uint8_t		length;
+	uint8_t		acpi_proc_id;
+	uint8_t		apic_id;
+	uint32_t	flags;
 #define	ACPI_PROC_ENABLE	0x00000001
 } __packed;
 
 struct acpi_madt_ioapic {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_IOAPIC	1
-	u_int8_t	length;
-	u_int8_t	acpi_ioapic_id;
-	u_int8_t	reserved;
-	u_int32_t	address;
-	u_int32_t	global_int_base;
+	uint8_t		length;
+	uint8_t		acpi_ioapic_id;
+	uint8_t		reserved;
+	uint32_t	address;
+	uint32_t	global_int_base;
 } __packed;
 
 struct acpi_madt_override {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_OVERRIDE	2
-	u_int8_t	length;
-	u_int8_t	bus;
+	uint8_t		length;
+	uint8_t		bus;
 #define	ACPI_OVERRIDE_BUS_ISA	0
-	u_int8_t	source;
-	u_int32_t	global_int;
-	u_int16_t	flags;
+	uint8_t		source;
+	uint32_t	global_int;
+	uint16_t	flags;
 #define	ACPI_OVERRIDE_POLARITY_BITS	0x3
 #define	ACPI_OVERRIDE_POLARITY_BUS		0x0
 #define	ACPI_OVERRIDE_POLARITY_HIGH		0x1
@@ -267,88 +267,88 @@ struct acpi_madt_override {
 } __packed;
 
 struct acpi_madt_nmi {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_NMI		3
-	u_int8_t	length;
-	u_int16_t	flags;		/* Same flags as acpi_madt_override */
-	u_int32_t	global_int;
+	uint8_t		length;
+	uint16_t	flags;		/* Same flags as acpi_madt_override */
+	uint32_t	global_int;
 } __packed;
 
 struct acpi_madt_lapic_nmi {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_LAPIC_NMI	4
-	u_int8_t	length;
-	u_int8_t	acpi_proc_id;
-	u_int16_t	flags;		/* Same flags as acpi_madt_override */
-	u_int8_t	local_apic_lint;
+	uint8_t		length;
+	uint8_t		acpi_proc_id;
+	uint16_t	flags;		/* Same flags as acpi_madt_override */
+	uint8_t		local_apic_lint;
 } __packed;
 
 struct acpi_madt_lapic_override {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_LAPIC_OVERRIDE	5
-	u_int8_t	length;
-	u_int16_t	reserved;
-	u_int64_t	lapic_address;
+	uint8_t		length;
+	uint16_t	reserved;
+	uint64_t	lapic_address;
 } __packed;
 
 struct acpi_madt_io_sapic {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_IO_SAPIC	6
-	u_int8_t	length;
-	u_int8_t	iosapic_id;
-	u_int8_t	reserved;
-	u_int32_t	global_int_base;
-	u_int64_t	iosapic_address;
+	uint8_t		length;
+	uint8_t		iosapic_id;
+	uint8_t		reserved;
+	uint32_t	global_int_base;
+	uint64_t	iosapic_address;
 } __packed;
 
 struct acpi_madt_local_sapic {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_LOCAL_SAPIC	7
-	u_int8_t	length;
-	u_int8_t	acpi_proc_id;
-	u_int8_t	local_sapic_id;
-	u_int8_t	local_sapic_eid;
-	u_int8_t	reserved[3];
-	u_int32_t	flags;		/* Same flags as acpi_madt_lapic */
-	u_int32_t	acpi_proc_uid;
-	u_int8_t	acpi_proc_uid_string[1];
+	uint8_t		length;
+	uint8_t		acpi_proc_id;
+	uint8_t		local_sapic_id;
+	uint8_t		local_sapic_eid;
+	uint8_t		reserved[3];
+	uint32_t	flags;		/* Same flags as acpi_madt_lapic */
+	uint32_t	acpi_proc_uid;
+	uint8_t		acpi_proc_uid_string[1];
 } __packed;
 
 struct acpi_madt_platform_int {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_PLATFORM_INT	8
-	u_int8_t	length;
-	u_int16_t	flags;		/* Same flags as acpi_madt_override */
-	u_int8_t	int_type;
+	uint8_t		length;
+	uint16_t	flags;		/* Same flags as acpi_madt_override */
+	uint8_t		int_type;
 #define	ACPI_MADT_PLATFORM_PMI		1
 #define	ACPI_MADT_PLATFORM_INIT		2
 #define	ACPI_MADT_PLATFORM_CORR_ERROR	3
-	u_int8_t	proc_id;
-	u_int8_t	proc_eid;
-	u_int8_t	io_sapic_vec;
-	u_int32_t	global_int;
-	u_int32_t	platform_int_flags;
+	uint8_t		proc_id;
+	uint8_t		proc_eid;
+	uint8_t		io_sapic_vec;
+	uint32_t	global_int;
+	uint32_t	platform_int_flags;
 #define	ACPI_MADT_PLATFORM_CPEI		0x00000001
 } __packed;
 
 struct acpi_madt_x2apic {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_X2APIC	9
-	u_int8_t	length;
-	u_int8_t	reserved[2];
-	u_int32_t	apic_id;
-	u_int32_t	flags;		/* Same flags as acpi_madt_lapic */
-	u_int32_t	acpi_proc_uid;
+	uint8_t		length;
+	uint8_t		reserved[2];
+	uint32_t	apic_id;
+	uint32_t	flags;		/* Same flags as acpi_madt_lapic */
+	uint32_t	acpi_proc_uid;
 } __packed;
 
 struct acpi_madt_x2apic_nmi {
-	u_int8_t	apic_type;
+	uint8_t		apic_type;
 #define	ACPI_MADT_X2APIC_NMI	10
-	u_int8_t	length;
-	u_int16_t	flags;		/* Same flags as acpi_madt_override */
-	u_int32_t	apic_proc_uid;
-	u_int8_t	local_x2apic_lint;
-	u_int8_t	reserved[3];
+	uint8_t		length;
+	uint16_t	flags;		/* Same flags as acpi_madt_override */
+	uint32_t	apic_proc_uid;
+	uint8_t		local_x2apic_lint;
+	uint8_t		reserved[3];
 } __packed;
 
 union acpi_madt_entry {
@@ -368,9 +368,9 @@ union acpi_madt_entry {
 struct acpi_sbst {
 	struct acpi_table_header	hdr;
 #define SBST_SIG	"SBST"
-	u_int32_t	warning_energy_level;
-	u_int32_t	low_energy_level;
-	u_int32_t	critical_energy_level;
+	uint32_t	warning_energy_level;
+	uint32_t	low_energy_level;
+	uint32_t	critical_energy_level;
 } __packed;
 
 struct acpi_ecdt {
@@ -378,59 +378,59 @@ struct acpi_ecdt {
 #define ECDT_SIG	"ECDT"
 	struct acpi_gas	ec_control;
 	struct acpi_gas ec_data;
-	u_int32_t	uid;
-	u_int8_t	gpe_bit;
-	u_int8_t	ec_id[1];
+	uint32_t	uid;
+	uint8_t		gpe_bit;
+	uint8_t		ec_id[1];
 } __packed;
 
 struct acpi_srat {
 	struct acpi_table_header	hdr;
 #define SRAT_SIG	"SRAT"
-	u_int32_t	reserved1;
-	u_int64_t	reserved2;
+	uint32_t	reserved1;
+	uint64_t	reserved2;
 } __packed;
 
 struct acpi_slit {
 	struct acpi_table_header	hdr;
 #define SLIT_SIG	"SLIT"
-	u_int64_t	number_of_localities;
+	uint64_t	number_of_localities;
 } __packed;
 
 struct acpi_hpet {
 	struct acpi_table_header	hdr;
 #define HPET_SIG	"HPET"
-	u_int32_t	event_timer_block_id;
+	uint32_t	event_timer_block_id;
 	struct acpi_gas	base_address;
-	u_int8_t	hpet_number;
-	u_int16_t	main_counter_min_clock_tick;
-	u_int8_t	page_protection;
+	uint8_t		hpet_number;
+	uint16_t	main_counter_min_clock_tick;
+	uint8_t		page_protection;
 } __packed;
 
 struct acpi_mcfg {
 	struct acpi_table_header	hdr;
 #define MCFG_SIG	"MCFG"
-	u_int8_t	reserved[8];
-	u_int64_t	base_address;
-	u_int16_t	segment;
-	u_int8_t	min_bus_number;
-	u_int8_t	max_bus_number;
-	u_int32_t	reserved1;
+	uint8_t		reserved[8];
+	uint64_t	base_address;
+	uint16_t	segment;
+	uint8_t		min_bus_number;
+	uint8_t		max_bus_number;
+	uint32_t	reserved1;
 } __packed;
 
 struct acpi_facs {
-	u_int8_t	signature[4];
+	uint8_t		signature[4];
 #define	FACS_SIG	"FACS"
-	u_int32_t	length;
-	u_int32_t	hardware_signature;
-	u_int32_t	wakeup_vector;
-	u_int32_t	global_lock;
+	uint32_t	length;
+	uint32_t	hardware_signature;
+	uint32_t	wakeup_vector;
+	uint32_t	global_lock;
 #define	FACS_LOCK_PENDING	0x00000001
 #define	FACS_LOCK_OWNED		0x00000002
-	u_int32_t	flags;
+	uint32_t	flags;
 #define	FACS_S4BIOS_F		0x00000001	/* S4BIOS_REQ supported */
 	uint64_t	x_wakeup_vector;
-	u_int8_t	version;
-	u_int8_t	reserved[31];
+	uint8_t		version;
+	uint8_t		reserved[31];
 } __packed;
 
 /*
@@ -640,13 +640,13 @@ struct acpi_ivrs {
 /*
  * PCI Configuration space
  */
-#define ACPI_ADR_PCIDEV(addr)	(u_int16_t)(addr >> 16)
-#define ACPI_ADR_PCIFUN(addr)	(u_int16_t)(addr & 0xFFFF)
-#define ACPI_PCI_BUS(addr) (u_int16_t)((addr) >> 48)
-#define ACPI_PCI_DEV(addr) (u_int16_t)((addr) >> 32)
-#define ACPI_PCI_FN(addr)  (u_int16_t)((addr) >> 16)
-#define ACPI_PCI_REG(addr) (u_int16_t)(addr)
-#define ACPI_PCI_ADDR(b,d,f,r) ((u_int64_t)(b)<<48LL | (u_int64_t)(d)<<32LL | (f)<<16LL | (r))
+#define ACPI_ADR_PCIDEV(addr)	(uint16_t)(addr >> 16)
+#define ACPI_ADR_PCIFUN(addr)	(uint16_t)(addr & 0xFFFF)
+#define ACPI_PCI_BUS(addr) (uint16_t)((addr) >> 48)
+#define ACPI_PCI_DEV(addr) (uint16_t)((addr) >> 32)
+#define ACPI_PCI_FN(addr)  (uint16_t)((addr) >> 16)
+#define ACPI_PCI_REG(addr) (uint16_t)(addr)
+#define ACPI_PCI_ADDR(b,d,f,r) ((uint64_t)(b)<<48LL | (uint64_t)(d)<<32LL | (f)<<16LL | (r))
 
 /*
  * PM1 Status Registers Fixed Hardware Feature Status Bits
diff --git a/sys/dev/acpi/acpisbs.c b/sys/dev/acpi/acpisbs.c
index 6f2867ed2bd..dda591783f1 100644
--- a/sys/dev/acpi/acpisbs.c
+++ b/sys/dev/acpi/acpisbs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpisbs.c,v 1.6 2017/03/13 02:33:34 jcs Exp $ */
+/* $OpenBSD: acpisbs.c,v 1.7 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Smart Battery subsystem device driver
  * ACPI 5.0 spec section 10
@@ -121,8 +121,8 @@ struct acpisbs_battery_check {
 #endif
 };
 
-extern void acpiec_read(struct acpiec_softc *, u_int8_t, int, u_int8_t *);
-extern void acpiec_write(struct acpiec_softc *, u_int8_t, int, u_int8_t *);
+extern void acpiec_read(struct acpiec_softc *, uint8_t, int, uint8_t *);
+extern void acpiec_write(struct acpiec_softc *, uint8_t, int, uint8_t *);
 
 int	acpisbs_match(struct device *, void *, void *);
 void	acpisbs_attach(struct device *, struct device *, void *);
diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c
index 17546bebe73..573a026d6ab 100644
--- a/sys/dev/acpi/acpithinkpad.c
+++ b/sys/dev/acpi/acpithinkpad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpithinkpad.c,v 1.59 2018/05/22 01:41:15 mlarkin Exp $	*/
+/*	$OpenBSD: acpithinkpad.c,v 1.60 2018/06/29 17:39:18 kettenis Exp $	*/
 /*
  * Copyright (c) 2008 joshua stein <jcs@openbsd.org>
  *
@@ -141,7 +141,7 @@ struct acpithinkpad_softc {
 	uint64_t		 sc_brightness;
 };
 
-extern void acpiec_read(struct acpiec_softc *, u_int8_t, int, u_int8_t *);
+extern void acpiec_read(struct acpiec_softc *, uint8_t, int, uint8_t *);
 
 int	thinkpad_match(struct device *, void *, void *);
 void	thinkpad_attach(struct device *, struct device *, void *);
@@ -253,7 +253,7 @@ void
 thinkpad_sensor_refresh(void *arg)
 {
 	struct acpithinkpad_softc *sc = arg;
-	u_int8_t lo, hi, i;
+	uint8_t lo, hi, i;
 	int64_t tmp;
 	char sname[5];
 
@@ -735,7 +735,7 @@ thinkpad_attach_deferred(void *v __unused)
 int
 thinkpad_get_volume_mute(struct acpithinkpad_softc *sc)
 {
-	u_int8_t vol = 0;
+	uint8_t vol = 0;
 
 	if (sc->sc_acpi->sc_ec == NULL)
 		return (-1);
diff --git a/sys/dev/acpi/acpitoshiba.c b/sys/dev/acpi/acpitoshiba.c
index 47507ae3434..d5646994ff0 100644
--- a/sys/dev/acpi/acpitoshiba.c
+++ b/sys/dev/acpi/acpitoshiba.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpitoshiba.c,v 1.9 2017/09/07 11:23:17 bluhm Exp $ */
+/* $OpenBSD: acpitoshiba.c,v 1.10 2018/06/29 17:39:18 kettenis Exp $ */
 /*-
  * Copyright (c) 2003 Hiroyuki Aizu <aizu@navi.org>
  * All rights reserved.
@@ -95,10 +95,10 @@ int	toshiba_read_events(struct acpitoshiba_softc *);
 int	toshiba_match(struct device *, void *, void *);
 void	toshiba_attach(struct device *, struct device *, void *);
 int	toshiba_hotkey(struct aml_node *, int, void *);
-int	toshiba_get_brightness(struct acpitoshiba_softc *, u_int32_t *);
-int	toshiba_set_brightness(struct acpitoshiba_softc *, u_int32_t *);
-int	toshiba_get_video_output(struct acpitoshiba_softc *, u_int32_t *);
-int	toshiba_set_video_output(struct acpitoshiba_softc *, u_int32_t *);
+int	toshiba_get_brightness(struct acpitoshiba_softc *, uint32_t *);
+int	toshiba_set_brightness(struct acpitoshiba_softc *, uint32_t *);
+int	toshiba_get_video_output(struct acpitoshiba_softc *, uint32_t *);
+int	toshiba_set_video_output(struct acpitoshiba_softc *, uint32_t *);
 int	toshiba_find_brightness(struct acpitoshiba_softc *, int *);
 int	toshiba_fn_key_brightness_up(struct acpitoshiba_softc *);
 int	toshiba_fn_key_brightness_down(struct acpitoshiba_softc *);
@@ -328,7 +328,7 @@ toshiba_attach(struct device *parent, struct device *self, void *aux)
 int
 toshiba_fn_key_brightness_up(struct acpitoshiba_softc *sc)
 {
-	u_int32_t brightness_level;
+	uint32_t brightness_level;
 	int ret;
 
 	ret = toshiba_get_brightness(sc, &brightness_level);
@@ -346,7 +346,7 @@ toshiba_fn_key_brightness_up(struct acpitoshiba_softc *sc)
 int
 toshiba_fn_key_brightness_down(struct acpitoshiba_softc *sc)
 {
-	u_int32_t brightness_level;
+	uint32_t brightness_level;
 	int ret;
 
 	ret = toshiba_get_brightness(sc, &brightness_level);
@@ -363,7 +363,7 @@ toshiba_fn_key_brightness_down(struct acpitoshiba_softc *sc)
 int
 toshiba_fn_key_video_output(struct acpitoshiba_softc *sc)
 {
-	u_int32_t video_output;
+	uint32_t video_output;
 	int ret;
 
 	ret = toshiba_get_video_output(sc, &video_output);
@@ -429,7 +429,7 @@ toshiba_hotkey(struct aml_node *node, int notify, void *arg)
 }
 
 int
-toshiba_set_brightness(struct acpitoshiba_softc *sc, u_int32_t *brightness)
+toshiba_set_brightness(struct acpitoshiba_softc *sc, uint32_t *brightness)
 {
 	struct aml_value args[HCI_WORDS];
 	int i;
@@ -459,7 +459,7 @@ toshiba_set_brightness(struct acpitoshiba_softc *sc, u_int32_t *brightness)
 }
 
 int
-toshiba_get_brightness(struct acpitoshiba_softc *sc, u_int32_t *brightness)
+toshiba_get_brightness(struct acpitoshiba_softc *sc, uint32_t *brightness)
 {
 	struct aml_value args[HCI_WORDS];
 	struct aml_value res;
@@ -494,7 +494,7 @@ toshiba_get_brightness(struct acpitoshiba_softc *sc, u_int32_t *brightness)
 }
 
 int
-toshiba_get_video_output(struct acpitoshiba_softc *sc, u_int32_t *video_output)
+toshiba_get_video_output(struct acpitoshiba_softc *sc, uint32_t *video_output)
 {
 	struct aml_value res, args[HCI_WORDS];
 	int i;
@@ -528,7 +528,7 @@ toshiba_get_video_output(struct acpitoshiba_softc *sc, u_int32_t *video_output)
 }
 
 int
-toshiba_set_video_output(struct acpitoshiba_softc *sc, u_int32_t *video_output)
+toshiba_set_video_output(struct acpitoshiba_softc *sc, uint32_t *video_output)
 {
 	struct aml_value args[HCI_WORDS];
 	int i;
diff --git a/sys/dev/acpi/acpitz.c b/sys/dev/acpi/acpitz.c
index af8bc5170ec..566187802c3 100644
--- a/sys/dev/acpi/acpitz.c
+++ b/sys/dev/acpi/acpitz.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpitz.c,v 1.53 2018/04/05 02:37:06 mlarkin Exp $ */
+/* $OpenBSD: acpitz.c,v 1.54 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
@@ -442,7 +442,7 @@ acpitz_refresh(void *arg)
 int
 acpitz_getreading(struct acpitz_softc *sc, char *name)
 {
-	u_int64_t		val;
+	uint64_t		val;
 
 	if (!aml_evalinteger(sc->sc_acpi, sc->sc_devnode, name, 0, NULL, &val))
 		return (val);
diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h
index 8d4ffc47ef0..172daa7aa17 100644
--- a/sys/dev/acpi/acpivar.h
+++ b/sys/dev/acpi/acpivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpivar.h,v 1.92 2018/06/26 06:52:58 kettenis Exp $	*/
+/*	$OpenBSD: acpivar.h,v 1.93 2018/06/29 17:39:18 kettenis Exp $	*/
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -65,7 +65,7 @@ struct acpi_attach_args {
 
 struct acpi_mem_map {
 	vaddr_t		 baseva;
-	u_int8_t	*va;
+	uint8_t		*va;
 	size_t		 vsize;
 	paddr_t		 pa;
 };
@@ -74,7 +74,7 @@ struct acpi_q {
 	SIMPLEQ_ENTRY(acpi_q)	 q_next;
 	int			 q_id;
 	void			*q_table;
-	u_int8_t		 q_data[0];
+	uint8_t			 q_data[0];
 };
 
 struct acpi_taskq {
@@ -138,9 +138,9 @@ typedef SIMPLEQ_HEAD(, acpi_wakeq) acpi_wakeqhead_t;
 #define ACPI_SST_SLEEP_CONTEXT	4
 
 struct acpi_parsestate {
-	u_int8_t		*start;
-	u_int8_t		*end;
-	u_int8_t		*pos;
+	uint8_t			*start;
+	uint8_t			*end;
+	uint8_t			*pos;
 };
 
 struct acpi_reg_map {
@@ -241,8 +241,8 @@ struct acpi_softc {
 	struct gpe_block	*gpe_table;
 
 	int			sc_threadwaiting;
-	u_int32_t		sc_gpe_sts;
-	u_int32_t		sc_gpe_en;
+	uint32_t		sc_gpe_sts;
+	uint32_t		sc_gpe_en;
 	struct acpi_thread	*sc_thread;
 
 	struct aml_node		*sc_tts;
@@ -344,11 +344,11 @@ void	acpi_register_gsb(struct acpi_softc *, struct aml_node *);
 
 int	acpi_set_gpehandler(struct acpi_softc *, int,
 	    int (*)(struct acpi_softc *, int, void *), void *, int);
-void	acpi_enable_gpe(struct acpi_softc *, u_int32_t);
+void	acpi_enable_gpe(struct acpi_softc *, uint32_t);
 
 int	acpiec_intr(struct acpiec_softc *);
-void	acpiec_read(struct acpiec_softc *, u_int8_t, int, u_int8_t *);
-void	acpiec_write(struct acpiec_softc *, u_int8_t, int, u_int8_t *);
+void	acpiec_read(struct acpiec_softc *, uint8_t, int, uint8_t *);
+void	acpiec_write(struct acpiec_softc *, uint8_t, int, uint8_t *);
 void	acpiec_handle_events(struct acpiec_softc *);
 
 #if NACPIPWRRES > 0
diff --git a/sys/dev/acpi/amltypes.h b/sys/dev/acpi/amltypes.h
index ed6c576aef2..c045de0f447 100644
--- a/sys/dev/acpi/amltypes.h
+++ b/sys/dev/acpi/amltypes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: amltypes.h,v 1.46 2018/05/17 20:21:15 kettenis Exp $ */
+/* $OpenBSD: amltypes.h,v 1.47 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
  *
@@ -265,34 +265,34 @@ struct aml_value {
 	union {
 		int64_t		vinteger;
 		char		*vstring;
-		u_int8_t	*vbuffer;
+		uint8_t		*vbuffer;
 		struct aml_value **vpackage;
 		struct {
-			u_int8_t	iospace;
-			u_int64_t	iobase;
-			u_int32_t	iolen;
+			uint8_t		iospace;
+			uint64_t	iobase;
+			uint32_t	iolen;
 			int		flag;
 		} vopregion;
 		struct {
 			int		flags;
-			u_int8_t	*start;
-			u_int8_t	*end;
+			uint8_t		*start;
+			uint8_t		*end;
 			struct aml_value *(*fneval)(struct aml_scope *, struct aml_value *);
-			u_int8_t        *base;
+			uint8_t	        *base;
 		} vmethod;
 		struct {
-			u_int16_t	 type;
-			u_int16_t	 flags;
-			u_int32_t	 bitpos;
-			u_int32_t	 bitlen;
+			uint16_t	 type;
+			uint16_t	 flags;
+			uint32_t	 bitpos;
+			uint32_t	 bitlen;
 			struct aml_value *ref1;
 			struct aml_value *ref2;
 			int		 ref3;
 		} vfield;
 		struct {
-			u_int8_t	proc_id;
-			u_int32_t	proc_addr;
-			u_int8_t	proc_len;
+			uint8_t		proc_id;
+			uint32_t	proc_addr;
+			uint8_t		proc_len;
 		} vprocessor;
 		struct {
 			int		type;
@@ -300,12 +300,12 @@ struct aml_value {
 			struct aml_value *ref;
 		} vobjref;
 		struct {
-			u_int8_t	pwr_level;
-			u_int16_t	pwr_order;
+			uint8_t		pwr_level;
+			uint16_t	pwr_order;
 		} vpowerrsrc;
 		struct acpi_mutex	*vmutex;
 		struct {
-			u_int8_t         *name;
+			uint8_t	         *name;
 			struct aml_node  *node;
 		} vnameref;
 		struct {
@@ -382,9 +382,9 @@ struct aml_node {
 	int		attached;
 
 	char		name[5];
-	u_int16_t	opcode;
-	u_int8_t	*start;
-	u_int8_t	*end;
+	uint16_t	opcode;
+	uint8_t		*start;
+	uint8_t		*end;
 
 	struct aml_value *value;
 	struct acpi_pci *pci;
diff --git a/sys/dev/acpi/atk0110.c b/sys/dev/acpi/atk0110.c
index 873dcaa3c08..209df77a57f 100644
--- a/sys/dev/acpi/atk0110.c
+++ b/sys/dev/acpi/atk0110.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atk0110.c,v 1.14 2017/02/25 20:09:20 jcs Exp $	*/
+/*	$OpenBSD: atk0110.c,v 1.15 2018/06/29 17:39:18 kettenis Exp $	*/
 
 /*
  * Copyright (c) 2009 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -85,15 +85,15 @@ struct aibs_softc {
 
 /* Command buffer used for GITM and SITM methods */
 struct aibs_cmd_buffer {
-	u_int32_t	id;
-	u_int32_t	param1;
-	u_int32_t	param2;
+	uint32_t	id;
+	uint32_t	param1;
+	uint32_t	param2;
 };
 
 /* Return buffer used by the GITM and SITM mehtods */
 struct aibs_ret_buffer {
-	u_int32_t	flags;
-	u_int32_t	value;
+	uint32_t	flags;
+	uint32_t	value;
 	/* there is more stuff that is unknown */
 };
 
diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c
index db205eb47bb..75ec47e663a 100644
--- a/sys/dev/acpi/dsdt.c
+++ b/sys/dev/acpi/dsdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.c,v 1.241 2018/06/12 07:11:18 mlarkin Exp $ */
+/* $OpenBSD: dsdt.c,v 1.242 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
  *
@@ -63,13 +63,13 @@ struct aml_value	*aml_allocvalue(int, int64_t, const void *);
 struct aml_value	*_aml_setvalue(struct aml_value *, int, int64_t,
 			    const void *);
 
-u_int64_t		aml_convradix(u_int64_t, int, int);
-u_int64_t		aml_evalexpr(u_int64_t, u_int64_t, int);
-int			aml_lsb(u_int64_t);
-int			aml_msb(u_int64_t);
+uint64_t		aml_convradix(uint64_t, int, int);
+uint64_t		aml_evalexpr(uint64_t, uint64_t, int);
+int			aml_lsb(uint64_t);
+int			aml_msb(uint64_t);
 
-int			aml_tstbit(const u_int8_t *, int);
-void			aml_setbit(u_int8_t *, int, int);
+int			aml_tstbit(const uint8_t *, int);
+void			aml_setbit(uint8_t *, int, int);
 
 void			aml_addref(struct aml_value *, const char *);
 void			aml_delref(struct aml_value **, const char *);
@@ -101,7 +101,7 @@ struct aml_value	*aml_callosi(struct aml_scope *, struct aml_value *);
 
 const char		*aml_getname(const char *);
 int64_t			aml_hextoint(const char *);
-void			aml_dump(int, u_int8_t *);
+void			aml_dump(int, uint8_t *);
 void			_aml_die(const char *fn, int line, const char *fmt, ...);
 #define aml_die(x...)	_aml_die(__FUNCTION__, __LINE__, x)
 
@@ -488,7 +488,7 @@ acpi_stall(int us)
 
 #ifdef ACPI_DEBUG
 void
-aml_dump(int len, u_int8_t *buf)
+aml_dump(int len, uint8_t *buf)
 {
 	int		idx;
 
@@ -502,7 +502,7 @@ aml_dump(int len, u_int8_t *buf)
 
 /* Bit mangling code */
 int
-aml_tstbit(const u_int8_t *pb, int bit)
+aml_tstbit(const uint8_t *pb, int bit)
 {
 	pb += aml_bytepos(bit);
 
@@ -510,7 +510,7 @@ aml_tstbit(const u_int8_t *pb, int bit)
 }
 
 void
-aml_setbit(u_int8_t *pb, int bit, int val)
+aml_setbit(uint8_t *pb, int bit, int val)
 {
 	pb += aml_bytepos(bit);
 
@@ -1061,10 +1061,10 @@ aml_freevalue(struct aml_value *val)
 
 /* Convert number from one radix to another
  * Used in BCD conversion routines */
-u_int64_t
-aml_convradix(u_int64_t val, int iradix, int oradix)
+uint64_t
+aml_convradix(uint64_t val, int iradix, int oradix)
 {
-	u_int64_t rv = 0, pwr;
+	uint64_t rv = 0, pwr;
 
 	rv = 0;
 	pwr = 1;
@@ -1078,7 +1078,7 @@ aml_convradix(u_int64_t val, int iradix, int oradix)
 
 /* Calculate LSB */
 int
-aml_lsb(u_int64_t val)
+aml_lsb(uint64_t val)
 {
 	int		lsb;
 
@@ -1093,7 +1093,7 @@ aml_lsb(u_int64_t val)
 
 /* Calculate MSB */
 int
-aml_msb(u_int64_t val)
+aml_msb(uint64_t val)
 {
 	int		msb;
 
@@ -1107,10 +1107,10 @@ aml_msb(u_int64_t val)
 }
 
 /* Evaluate Math operands */
-u_int64_t
-aml_evalexpr(u_int64_t lhs, u_int64_t rhs, int opcode)
+uint64_t
+aml_evalexpr(uint64_t lhs, uint64_t rhs, int opcode)
 {
-	u_int64_t res = 0;
+	uint64_t res = 0;
 
 	switch (opcode) {
 		/* Math operations */
@@ -1216,8 +1216,8 @@ aml_evalexpr(u_int64_t lhs, u_int64_t rhs, int opcode)
 void
 aml_bufcpy(void *pvDst, int dstPos, const void *pvSrc, int srcPos, int len)
 {
-	const u_int8_t *pSrc = pvSrc;
-	u_int8_t *pDst = pvDst;
+	const uint8_t *pSrc = pvSrc;
+	uint8_t *pDst = pvDst;
 	int		idx;
 
 	if (aml_bytealigned(dstPos|srcPos|len)) {
@@ -1437,7 +1437,7 @@ int odp;
 const char hext[] = "0123456789ABCDEF";
 
 const char *
-aml_eisaid(u_int32_t pid)
+aml_eisaid(uint32_t pid)
 {
 	static char id[8];
 
@@ -2325,7 +2325,7 @@ acpi_genio(struct acpi_softc *sc, int iodir, int iospace, uint64_t address,
     int access_size, int len, void *buffer)
 {
 	struct aml_regionspace *region = &aml_regionspace[iospace];
-	u_int8_t *pb;
+	uint8_t *pb;
 	int reg;
 
 	dnprintf(50, "genio: %.2x 0x%.8llx %s\n",
@@ -2333,7 +2333,7 @@ acpi_genio(struct acpi_softc *sc, int iodir, int iospace, uint64_t address,
 
 	KASSERT((len % access_size) == 0);
 
-	pb = (u_int8_t *)buffer;
+	pb = (uint8_t *)buffer;
 	for (reg = 0; reg < len; reg += access_size) {
 		uint64_t value;
 		int err;
@@ -4451,7 +4451,7 @@ parse_error:
 }
 
 int
-acpi_parse_aml(struct acpi_softc *sc, u_int8_t *start, u_int32_t length)
+acpi_parse_aml(struct acpi_softc *sc, uint8_t *start, uint32_t length)
 {
 	struct aml_scope *scope;
 	struct aml_value res;
diff --git a/sys/dev/acpi/dsdt.h b/sys/dev/acpi/dsdt.h
index 66e1ba73c99..7242e55cdd9 100644
--- a/sys/dev/acpi/dsdt.h
+++ b/sys/dev/acpi/dsdt.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.h,v 1.74 2017/11/29 15:22:22 kettenis Exp $ */
+/* $OpenBSD: dsdt.h,v 1.75 2018/06/29 17:39:18 kettenis Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  *
@@ -34,12 +34,12 @@ struct aml_scope {
 
 
 struct aml_opcode {
-	u_int32_t		opcode;
+	uint32_t		opcode;
 	const char		*mnem;
 	const char		*args;
 };
 
-const char		*aml_eisaid(u_int32_t);
+const char		*aml_eisaid(uint32_t);
 const char		*aml_mnem(int, uint8_t *);
 int64_t			aml_val2int(struct aml_value *);
 struct aml_node		*aml_searchname(struct aml_node *, const void *);
@@ -56,7 +56,7 @@ void			aml_walktree(struct aml_node *);
 void			aml_find_node(struct aml_node *, const char *,
 			    int (*)(struct aml_node *, void *), void *);
 int			acpi_parse_aml(struct acpi_softc *, u_int8_t *,
-			    u_int32_t);
+			    uint32_t);
 void			aml_register_notify(struct aml_node *, const char *,
 			    int (*)(struct aml_node *, int, void *), void *,
 			    int);