From 031b57caa39e182fc851f79fcd6e279074710689 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 9 Oct 2009 13:46:39 +0000
Subject: 2009-10-09	Sebastian Huber <Sebastian.Huber@embedded-brains.de>

	* cpukit/sapi/include/rtems/io.h: Documentation.
	* cpukit/sapi/src/ioregisterdriver.c: Call from interrupt context is
	an error.
	* cpukit/sapi/src/iounregisterdriver.c: Disable preemption during
	critical section.
---
 cpukit/sapi/src/iounregisterdriver.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'cpukit/sapi/src/iounregisterdriver.c')

diff --git a/cpukit/sapi/src/iounregisterdriver.c b/cpukit/sapi/src/iounregisterdriver.c
index 5761138b09..631ffbfd82 100644
--- a/cpukit/sapi/src/iounregisterdriver.c
+++ b/cpukit/sapi/src/iounregisterdriver.c
@@ -17,6 +17,8 @@
 
 #include <rtems/system.h>
 #include <rtems/io.h>
+#include <rtems/rtems/intr.h>
+#include <rtems/score/thread.h>
 #include <string.h>
 
 /*
@@ -36,13 +38,20 @@ rtems_status_code rtems_io_unregister_driver(
   rtems_device_major_number major
 )
 {
+  if ( rtems_interrupt_is_in_progress() )
+    return RTEMS_CALLED_FROM_ISR;
+
   if ( major < _IO_Number_of_drivers ) {
+    _Thread_Disable_dispatch();
     memset(
       &_IO_Driver_address_table[major],
       0,
       sizeof( rtems_driver_address_table )
     );
+    _Thread_Enable_dispatch();
+
     return RTEMS_SUCCESSFUL;
   }
+
   return RTEMS_UNSATISFIED;
 }
-- 
cgit v1.2.3