score: Use ISR lock for IO driver registration

Create implementation header file.

Update #2555.

10 files changed, 21 insertions, 26 deletions

diff --git a/cpukit/sapi/src/exinit.c b/cpukit/sapi/src/exinit.c
index 350c774fc6..69db694b72 100644
--- a/cpukit/sapi/src/exinit.c
+++ b/cpukit/sapi/src/exinit.c
@@ -23,7 +23,7 @@
 #include <rtems/config.h>
 #include <rtems/extensionimpl.h>
 #include <rtems/init.h>
-#include <rtems/io.h>
+#include <rtems/ioimpl.h>
 #include <rtems/sysinit.h>
 #include <rtems/score/sysstate.h>
 
diff --git a/cpukit/sapi/src/io.c b/cpukit/sapi/src/io.c
index c2698bcb7e..6cda083d21 100644
--- a/cpukit/sapi/src/io.c
+++ b/cpukit/sapi/src/io.c
@@ -19,7 +19,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/io.h>
+#include <rtems/ioimpl.h>
 
 bool _IO_All_drivers_initialized;
 
diff --git a/cpukit/sapi/src/ioclose.c b/cpukit/sapi/src/ioclose.c
index 035c02746a..038c9833ac 100644
--- a/cpukit/sapi/src/ioclose.c
+++ b/cpukit/sapi/src/ioclose.c
@@ -21,8 +21,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/io.h>
+#include <rtems/ioimpl.h>
 
 rtems_status_code rtems_io_close(
   rtems_device_major_number  major,
diff --git a/cpukit/sapi/src/iocontrol.c b/cpukit/sapi/src/iocontrol.c
index 2aa7d62ea2..8d6e0a1f3f 100644
--- a/cpukit/sapi/src/iocontrol.c
+++ b/cpukit/sapi/src/iocontrol.c
@@ -19,8 +19,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/io.h>
+#include <rtems/ioimpl.h>
 
 rtems_status_code rtems_io_control(
   rtems_device_major_number  major,
diff --git a/cpukit/sapi/src/ioinitialize.c b/cpukit/sapi/src/ioinitialize.c
index e1c2e05ae4..7664644ee1 100644
--- a/cpukit/sapi/src/ioinitialize.c
+++ b/cpukit/sapi/src/ioinitialize.c
@@ -19,8 +19,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/io.h>
+#include <rtems/ioimpl.h>
 
 rtems_status_code rtems_io_initialize(
   rtems_device_major_number  major,
diff --git a/cpukit/sapi/src/ioopen.c b/cpukit/sapi/src/ioopen.c
index 7c5b0dcecf..5fcefe7d0e 100644
--- a/cpukit/sapi/src/ioopen.c
+++ b/cpukit/sapi/src/ioopen.c
@@ -21,8 +21,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/io.h>
+#include <rtems/ioimpl.h>
 
 rtems_status_code rtems_io_open(
   rtems_device_major_number  major,
diff --git a/cpukit/sapi/src/ioread.c b/cpukit/sapi/src/ioread.c
index 43bf053b4f..2701cc9cd6 100644
--- a/cpukit/sapi/src/ioread.c
+++ b/cpukit/sapi/src/ioread.c
@@ -19,8 +19,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/io.h>
+#include <rtems/ioimpl.h>
 
 rtems_status_code rtems_io_read(
   rtems_device_major_number  major,
diff --git a/cpukit/sapi/src/ioregisterdriver.c b/cpukit/sapi/src/ioregisterdriver.c
index 33ee6b0b72..1d32320641 100644
--- a/cpukit/sapi/src/ioregisterdriver.c
+++ b/cpukit/sapi/src/ioregisterdriver.c
@@ -21,9 +21,9 @@
 #include "config.h"
 #endif
 
-#include <rtems/io.h>
-#include <rtems/rtems/intr.h>
-#include <rtems/score/threaddispatch.h>
+#include <rtems/ioimpl.h>
+
+ISR_LOCK_DEFINE( , _IO_Driver_registration_lock, "IO Driver Registration" )
 
 static inline bool rtems_io_is_empty_table(
   const rtems_driver_address_table *table
@@ -64,6 +64,7 @@ rtems_status_code rtems_io_register_driver(
 )
 {
   rtems_device_major_number major_limit = _IO_Number_of_drivers;
+  ISR_lock_Context lock_context;
 
   if ( rtems_interrupt_is_in_progress() )
     return RTEMS_CALLED_FROM_ISR;
@@ -83,13 +84,13 @@ rtems_status_code rtems_io_register_driver(
   if ( major >= major_limit )
     return RTEMS_INVALID_NUMBER;
 
-  _Thread_Disable_dispatch();
+  _IO_Driver_registration_acquire( &lock_context );
 
   if ( major == 0 ) {
     rtems_status_code sc = rtems_io_obtain_major_number( registered_major );
 
     if ( sc != RTEMS_SUCCESSFUL ) {
-      _Thread_Enable_dispatch();
+      _IO_Driver_registration_release( &lock_context );
       return sc;
     }
     major = *registered_major;
@@ -97,7 +98,7 @@ rtems_status_code rtems_io_register_driver(
     rtems_driver_address_table *const table = _IO_Driver_address_table + major;
 
     if ( !rtems_io_is_empty_table( table ) ) {
-      _Thread_Enable_dispatch();
+      _IO_Driver_registration_release( &lock_context );
       return RTEMS_RESOURCE_IN_USE;
     }
 
@@ -106,7 +107,7 @@ rtems_status_code rtems_io_register_driver(
 
   _IO_Driver_address_table [major] = *driver_table;
 
-  _Thread_Enable_dispatch();
+  _IO_Driver_registration_release( &lock_context );
 
   if ( _IO_All_drivers_initialized ) {
     /* Other drivers have already been initialized, we initialize
diff --git a/cpukit/sapi/src/iounregisterdriver.c b/cpukit/sapi/src/iounregisterdriver.c
index 3748d34151..fff4cd02bb 100644
--- a/cpukit/sapi/src/iounregisterdriver.c
+++ b/cpukit/sapi/src/iounregisterdriver.c
@@ -19,9 +19,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/io.h>
-#include <rtems/rtems/intr.h>
-#include <rtems/score/threaddispatch.h>
+#include <rtems/ioimpl.h>
 
 #include <string.h>
 
@@ -33,13 +31,15 @@ rtems_status_code rtems_io_unregister_driver(
     return RTEMS_CALLED_FROM_ISR;
 
   if ( major < _IO_Number_of_drivers ) {
-    _Thread_Disable_dispatch();
+    ISR_lock_Context lock_context;
+
+    _IO_Driver_registration_acquire( &lock_context );
     memset(
       &_IO_Driver_address_table[major],
       0,
       sizeof( rtems_driver_address_table )
     );
-    _Thread_Enable_dispatch();
+    _IO_Driver_registration_release( &lock_context );
 
     return RTEMS_SUCCESSFUL;
   }
diff --git a/cpukit/sapi/src/iowrite.c b/cpukit/sapi/src/iowrite.c
index 3e1608dbf7..ba41851a0f 100644
--- a/cpukit/sapi/src/iowrite.c
+++ b/cpukit/sapi/src/iowrite.c
@@ -19,8 +19,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/system.h>
-#include <rtems/io.h>
+#include <rtems/ioimpl.h>
 
 rtems_status_code rtems_io_write(
   rtems_device_major_number  major,