move things around (nw)

src/emu/driver.cpp

@@ -565,6 +565,23 @@ void driver_device::flip_screen_y_set(UINT32 on)
 }
 
 
+/***************************************************************************
+PORT READING HELPERS
+***************************************************************************/
+
+/*-------------------------------------------------
+custom_port_read - act like input_port_read
+but it is a custom port, it is useful for
+e.g. input ports which expect the same port
+repeated both in the upper and lower half
+-------------------------------------------------*/
+
+CUSTOM_INPUT_MEMBER(driver_device::custom_port_read)
+{
+	const char *tag = (const char *)param;
+	return ioport(tag)->read();
+}
+
 
 //**************************************************************************
 //  MISC READ/WRITE HANDLERS

src/emu/machine/generic.cpp

@@ -253,37 +253,3 @@ void coin_lockout_global_w(running_machine &machine, int on)
 	for (i = 0; i < ARRAY_LENGTH(state->coinlockedout); i++)
 		coin_lockout_w(machine, i, on);
 }
-
-
-/***************************************************************************
-    LED CODE
-***************************************************************************/
-
-/*-------------------------------------------------
-    set_led_status - set the state of a given LED
--------------------------------------------------*/
-
-void set_led_status(running_machine &machine, int num, int on)
-{
-	output_set_led_value(num, on);
-}
-
-
-
-
-/***************************************************************************
-    PORT READING HELPERS
-***************************************************************************/
-
-/*-------------------------------------------------
-    custom_port_read - act like input_port_read
-    but it is a custom port, it is useful for
-    e.g. input ports which expect the same port
-    repeated both in the upper and lower half
--------------------------------------------------*/
-
-CUSTOM_INPUT_MEMBER( driver_device::custom_port_read )
-{
-	const char *tag = (const char *)param;
-	return ioport(tag)->read();
-}

src/emu/machine/generic.h

@@ -61,9 +61,4 @@ int coin_lockout_get_state(running_machine &machine, int num);
 /* enable/disable global coin lockout */
 void coin_lockout_global_w(running_machine &machine, int on);
 
-/* ----- miscellaneous bits & pieces ----- */
-
-/* set the status of an LED */
-void set_led_status(running_machine &machine, int num, int value);
-
 #endif  /* __MACHINE_GENERIC_H__ */

src/emu/output.cpp

@@ -368,3 +368,17 @@ const char *output_id_to_name(UINT32 id)
 	/* nothing found, return NULL */
 	return nullptr;
 }
+
+/***************************************************************************
+LED CODE
+***************************************************************************/
+
+/*-------------------------------------------------
+set_led_status - set the state of a given LED
+-------------------------------------------------*/
+
+void set_led_status(running_machine &machine, int num, int on)
+{
+	output_set_led_value(num, on);
+}
+

src/emu/output.h

@@ -56,6 +56,8 @@ UINT32 output_name_to_id(const char *outname);
 /* map a unique ID back to a name */
 const char *output_id_to_name(UINT32 id);
 
+/* set the status of an LED */
+void set_led_status(running_machine &machine, int num, int value);
 
 
 /***************************************************************************