Again, loads of refactoring and removing and adding files.

[arc.git] / arch / ppc / mpc55xx / drivers / Can.c

diff --git a/arch/ppc/mpc55xx/drivers/Can.c b/arch/ppc/mpc55xx/drivers/Can.c
index aeddc2eb446d0f0aab5909cf01be00d83dcca360..0b9dde2f1ebd0996bd139068b6914b4eaebe2b83 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Can.c
+++ b/arch/ppc/mpc55xx/drivers/Can.c
@@ -33,7 +33,7 @@
 #include <string.h>\r
 #if defined(USE_KERNEL)\r
 #include "Os.h"
-#include "int_ctrl.h"\r
+#include "irq.h"\r
 #endif\r
 \r
 \r
@@ -648,21 +648,21 @@ static void Can_Isr(int unit) {
 #define INSTALL_HANDLERS( _can_name,_boff,_err,_start,_stop) \\r
   do { \\r
     TaskType tid; \\r
-    tid = Os_CreateIsr(_can_name ## _BusOff,1/*prio*/,"Can"); \\r
-    IntCtrl_AttachIsr2(tid,NULL,_boff); \\r
-    tid = Os_CreateIsr(_can_name ## _Err,1/*prio*/,"Can"); \\r
-    IntCtrl_AttachIsr2(tid,NULL,_err); \\r
+    tid = Os_Arc_CreateIsr(_can_name ## _BusOff,1/*prio*/,"Can"); \\r
+    Irq_AttachIsr2(tid,NULL,_boff); \\r
+    tid = Os_Arc_CreateIsr(_can_name ## _Err,1/*prio*/,"Can"); \\r
+    Irq_AttachIsr2(tid,NULL,_err); \\r
     for(i=_start;i<=_stop;i++) {  \\r
-      tid = Os_CreateIsr(_can_name ## _Isr,1/*prio*/,"Can"); \\r
-                       IntCtrl_AttachIsr2(tid,NULL,i); \\r
+      tid = Os_Arc_CreateIsr(_can_name ## _Isr,1/*prio*/,"Can"); \\r
+                       Irq_AttachIsr2(tid,NULL,i); \\r
     } \\r
   } while(0);\r
 #else\r
 #define INSTALL_HANDLERS( _can_name,_boff,_err,_start,_stop) \\r
-  IntCtrl_InstallVector(_can_name ## _BusOff, _boff, 1, CPU_Z1); \\r
-  IntCtrl_InstallVector(_can_name ## _Err, _err, 1, CPU_Z1);    \\r
+  Irq_InstallVector(_can_name ## _BusOff, _boff, 1, CPU_Z1); \\r
+  Irq_InstallVector(_can_name ## _Err, _err, 1, CPU_Z1);    \\r
   for(i=_start;i<=_stop;i++) {                                                                                                                         \\r
-    IntCtrl_InstallVector(_can_name ## _Isr, i, 1, CPU_Z1); \\r
+    Irq_InstallVector(_can_name ## _Isr, i, 1, CPU_Z1); \\r
   }\r
 #endif\r
 \r