aboutsummaryrefslogtreecommitdiff
path: root/libmachdev
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2022-01-01 13:53:31 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2022-01-01 18:05:00 +0100
commita8d51bf0ce26fd26e00338540857f43b8a99e126 (patch)
tree917f249fbf6873280161959c74a71b8edb0f4cea /libmachdev
parente2b75a67395fbbdd36bb0bceaea2465a2a1fa172 (diff)
downloadhurd-a8d51bf0ce26fd26e00338540857f43b8a99e126.tar.gz
hurd-a8d51bf0ce26fd26e00338540857f43b8a99e126.tar.bz2
hurd-a8d51bf0ce26fd26e00338540857f43b8a99e126.zip
Fix build warnings
No actual behavior change.
Diffstat (limited to 'libmachdev')
-rw-r--r--libmachdev/Makefile3
-rw-r--r--libmachdev/ds_routines.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/libmachdev/Makefile b/libmachdev/Makefile
index f5dac9ba..a4a58198 100644
--- a/libmachdev/Makefile
+++ b/libmachdev/Makefile
@@ -29,6 +29,7 @@ LDLIBS += -lpthread -lmachuser
OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
device-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name"
-mach_i386-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name"
+mach_i386-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name" \
+ "-DMACH_I386_IMPORTS=import \"$(srcdir)/../libports/ports.h\";"
include ../Makeconf
diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c
index ac915166..b12d1ff3 100644
--- a/libmachdev/ds_routines.c
+++ b/libmachdev/ds_routines.c
@@ -90,7 +90,8 @@ static int num_emul = 0;
io_return_t
ds_device_open (mach_port_t open_port, mach_port_t reply_port,
mach_msg_type_name_t reply_port_type, dev_mode_t mode,
- char *name, device_t *devp, mach_msg_type_name_t *devicePoly)
+ dev_name_t name, device_t *devp,
+ mach_msg_type_name_t *devicePoly)
{
int i;
mach_port_t dev_master;
@@ -201,7 +202,7 @@ ds_device_read (struct mach_device *device, mach_port_t reply_port,
io_return_t
ds_device_read_inband (struct mach_device *device, mach_port_t reply_port,
mach_msg_type_name_t reply_port_type, dev_mode_t mode,
- recnum_t recnum, int count, char *data,
+ recnum_t recnum, int count, io_buf_ptr_inband_t data,
unsigned *bytes_read)
{
/* Refuse if device is dead or not completely open. */