Merge remote-tracking branch 'vincent-ext/3.00.00.13_eng' into 12_eng
authorChris Ring <cring@ti.com>
Sun, 17 Mar 2013 18:13:22 +0000 (11:13 -0700)
committerChris Ring <cring@ti.com>
Sun, 17 Mar 2013 18:13:22 +0000 (11:13 -0700)
packages/ti/ipc/family/omap54xx/InterruptDsp.c
packages/ti/ipc/family/omap54xx/VirtQueue.c
packages/ti/srvmgr/omx/package.xs

index 459fcb8674640b7804d53dcb5b5d581c75273b11..fa04d0569099e8c769d82f81f2c1bc4cdca763fe 100644 (file)
@@ -30,8 +30,8 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- *  ======== Interrupt.c ========
- *  OMAP4430/Ducati Interrupt Manger
+ *  ======== InterruptDsp.c ========
+ *  Mailbox based interrupt manager
  */
 
 #include <xdc/std.h>
index ab0117399e720fe62a73a17577984220c74f0455..6916a93e2eeea7f972233941f45730a476a4e361 100644 (file)
@@ -211,11 +211,7 @@ extern Int OffloadM3_processSysM3Tasks(UArg msg);
 
 static inline Void * mapPAtoVA(UInt pa)
 {
-#ifndef DSPC674
-    return (Void *)((pa & 0x000fffffU) | 0xa0000000U);
-#else
-    return (Void *)((pa & 0x000fffffU) | 0x9fb00000U);
-#endif
+    return (Void *)((pa & 0x000fffffU) | IPC_MEM_VRING0);
 }
 
 static inline UInt mapVAtoPA(Void * va)
index dfb9b38b44ae8dabad7540c98b0604c3d482a6a2..e65a7d90b6fb02d87bba4766489dc20075c820e3 100644 (file)
@@ -78,3 +78,9 @@ function getLibs(prog)
 
     return libAry.join(";");
 }
+
+function close()
+{
+    /* TBD: just like the .c file, this only works for OMAP5 right now */
+    xdc.loadPackage('ti.ipc.family.omap54xx');
+}
\ No newline at end of file