diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-11-26 15:06:21 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-11-26 15:06:21 +0100 |
| commit | 4ef693ac89cb514f75fd8643322a36d15474902a (patch) | |
| tree | 3968f8db46623e0b89ee78b6c0e0fae81ee9060f /libmachdev | |
| parent | a712dbc42369b44556bf11e2c53e7cad8f476c13 (diff) | |
sync libmachdev
Diffstat (limited to 'libmachdev')
| -rw-r--r-- | libmachdev/Makefile | 3 | ||||
| -rw-r--r-- | libmachdev/ds_routines.c | 45 | ||||
| -rw-r--r-- | libmachdev/net.c | 1 |
3 files changed, 1 insertions, 48 deletions
diff --git a/libmachdev/Makefile b/libmachdev/Makefile index a47bf325..345c004f 100644 --- a/libmachdev/Makefile +++ b/libmachdev/Makefile @@ -31,6 +31,3 @@ OBJS = $(SRCS:.c=.o) $(MIGSTUBS) MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h include ../Makeconf - -$(libname).so.$(hurd-version): - echo "INPUT ( $(libname).a )" > $@ diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c index 6bd5a129..e9fbe944 100644 --- a/libmachdev/ds_routines.c +++ b/libmachdev/ds_routines.c @@ -87,52 +87,7 @@ boolean_t is_master_device (mach_port_t port); * What follows is the interface for the native Mach devices. */ -static inline mach_port_t -mach_convert_device_to_port (mach_device_t device) -{ - if (device == NULL) - return MACH_PORT_NULL; - - // TODO I have to somehow dereference it when it is called at the first time. - return ports_get_right (device); -} - /* Implementation of device interface */ -kern_return_t -ds_xxx_device_set_status (struct mach_device *device, dev_flavor_t flavor, - dev_status_t status, size_t statu_cnt) -{ - return D_INVALID_OPERATION; -} - -kern_return_t -ds_xxx_device_get_status (struct mach_device *device, dev_flavor_t flavor, - dev_status_t status, size_t *statuscnt) -{ - return D_INVALID_OPERATION; -} - -kern_return_t -ds_xxx_device_set_filter (struct mach_device *device, mach_port_t rec, - int pri, filter_array_t filt, size_t len) -{ - return D_INVALID_OPERATION; -} - -io_return_t -ds_device_intr_register (mach_port_t master_port, int irq, - int flags, int id, mach_port_t receive_port) -{ - return D_INVALID_OPERATION; -} - -kern_return_t -ds_device_intr_enable (mach_port_t master_port, - int line, char status) -{ - return D_INVALID_OPERATION; -} - 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, diff --git a/libmachdev/net.c b/libmachdev/net.c index 7ddf95d9..47e85aac 100644 --- a/libmachdev/net.c +++ b/libmachdev/net.c @@ -239,6 +239,7 @@ netif_rx_handle (char *data, int len, struct net_device *dev) net_msg->msg_hdr.msgh_size = (((mach_msg_size_t) (sizeof (struct net_rcv_msg) - sizeof net_msg->sent + + sizeof (struct packet_header) - NET_RCV_MAX + pack_size)) + 3) & ~3; /* Copy packet into message buffer. */ |