Merge branch 'master' of https://github.com/86Box/86Box into qt

src/include/86box/device.h

@@ -95,6 +95,7 @@ typedef struct {
 
 typedef struct _device_ {
     const char	*name;
+    const char *internal_name;
     uint32_t	flags;		/* system flags */
     uint32_t	local;		/* flags local to device */
 
@@ -102,9 +103,9 @@ typedef struct _device_ {
     void	(*close)(void *priv);
     void	(*reset)(void *priv);
     union {
-	int		(*available)(void);
-	int		(*poll)(int x, int y, int z, int b, void *priv);
-	void		(*register_pci_slot)(int device, int type, int inta, int intb, int intc, int intd, void *priv);
+    int		(*available)(void);
+    int		(*poll)(int x, int y, int z, int b, void *priv);
+    void		(*register_pci_slot)(int device, int type, int inta, int intb, int intc, int intd, void *priv);
     };
     void	(*speed_changed)(void *priv);
     void	(*force_redraw)(void *priv);
@@ -159,6 +160,8 @@ extern void		device_set_config_hex20(const char *s, int val);
 extern void		device_set_config_mac(const char *s, int val);
 extern const char	*device_get_config_string(const char *name);
 
+extern char *		device_get_internal_name(const device_t *d);
+
 extern int	machine_get_config_int(char *s);
 extern char	*machine_get_config_string(char *s);
 

src/include/86box/gameport.h

@@ -83,6 +83,7 @@ typedef struct {
 
 typedef struct {
     const char *name;
+    const char *internal_name;
 
     void	*(*init)(void);
     void	(*close)(void *p);

src/include/86box/network.h

@@ -78,7 +78,6 @@ typedef struct netpkt {
 } netpkt_t;
 
 typedef struct {
-    const char		*internal_name;
     const device_t	*device;
     void		*priv;
     int			(*poll)(void *);