From 23193fd35c9eaf20d794a7cc231f7c2a931a6378 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 30 Mar 2020 01:17:11 +0200 Subject: machdev: Expose machdev_emul_device structure * libmachdev/machdev-dev_hdr.h (DEVICE_NULL): Remove macro. (emul_device): Rename structure to machdev_emul_device. (emul_device_t): Rename type to machdev_emul_device_t. (mach_device, mach_device_t, MACH_DEVICE_NULL): Move to... * libmachdev/mach_device.h: ... new file. * libmachdev/ds_routines.c: Include "mach_device.h". * libmachdev/machdev-device_emul.h: Include , , , * libmachdev/machdev.h: Include "machdev_hdr.h". * libmachdev/mig-decls.h: Include "mach_device.h". * libmachdev/Makefile (LCLHDRS): Add mach_device.h. (installhdrs): Add machdev-dev_hdr.h. --- libmachdev/machdev-dev_hdr.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'libmachdev/machdev-dev_hdr.h') diff --git a/libmachdev/machdev-dev_hdr.h b/libmachdev/machdev-dev_hdr.h index 5b5e3e61..2bb3d295 100644 --- a/libmachdev/machdev-dev_hdr.h +++ b/libmachdev/machdev-dev_hdr.h @@ -64,25 +64,12 @@ /* This structure is associated with each open device port. * The port representing the device points to this structure. */ -struct emul_device +struct machdev_emul_device { struct machdev_device_emulation_ops *emul_ops; void *emul_data; }; -typedef struct emul_device *emul_device_t; - -#define DEVICE_NULL ((device_t) 0) - -/* - * Generic device header. May be allocated with the device, - * or built when the device is opened. - */ -struct mach_device { - struct port_info port; - struct emul_device dev; /* the real device structure */ -}; -typedef struct mach_device *mach_device_t; -#define MACH_DEVICE_NULL ((mach_device_t)0) +typedef struct machdev_emul_device *machdev_emul_device_t; #endif /* _MACHDEV_DEVICE_DEV_HDR_H_ */ -- cgit v1.2.3