remove mmioMap and mmioUnmap deprecated functions.

Change-Id: I9d9094d5c6689c9127c6948239c7c9aaebacdfde
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/514
Tested-by: Jenkins Server
Reviewed-by: MATTHEW S. BARTH <msbarth@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 0 insertions, 91 deletions

diff --git a/src/kernel/devicesegment.C b/src/kernel/devicesegment.C
index 7fb4803dd..479183d4c 100644
--- a/src/kernel/devicesegment.C
+++ b/src/kernel/devicesegment.C
@@ -40,22 +40,6 @@ void DeviceSegment::init()
 }
 
 /**
- * @brief DEPRECATED
- */
-void* DeviceSegment::mmioMap(void* ra, size_t pages)
-{
-    return Singleton<DeviceSegment>::instance()._mmioMap(ra, pages);
-}
-
-/**
- * @brief DEPRECATED
- */
-int DeviceSegment::mmioUnmap(void* ea, size_t pages)
-{
-    return Singleton<DeviceSegment>::instance()._mmioUnmap(ea, pages);
-}
-
-/**
  * STATIC
  * @brief Map a device into the device segment(2TB)
  */
@@ -115,45 +99,6 @@ bool DeviceSegment::handlePageFault(task_t* i_task, uint64_t i_addr)
     return true;
 }
 
-/**
- * @brief DEPRECATED
- */
-void* DeviceSegment::_mmioMap(void* ra, size_t pages)
-{
-    for (size_t i = 0; i < MMIO_MAP_DEVICES; i++)
-    {
-        if (0 == iv_mmioMap[i].addr)
-        {
-            iv_mmioMap[i].size = THIRTYTWO_GB;
-            iv_mmioMap[i].addr = reinterpret_cast<uint64_t>(ra);
-            return reinterpret_cast<void*>(i *
-                                      ((1ull << SLBE_s) / MMIO_MAP_DEVICES) +
-                                      this->getBaseAddress());
-        }
-    }
-
-    return NULL;
-}
-
-/**
- * @brief DEPRECATED
- */
-int DeviceSegment::_mmioUnmap(void* ea, size_t pages)
-{
-    uint64_t segment_ea = reinterpret_cast<uint64_t>(ea) -
-                          this->getBaseAddress();
-    size_t idx = segment_ea / ((1ull << SLBE_s) / MMIO_MAP_DEVICES);
-    if (0 != iv_mmioMap[idx].addr)
-    {
-        PageTableManager::delRangePN(iv_mmioMap[idx].addr / PAGESIZE,
-                                     iv_mmioMap[idx].addr / PAGESIZE +
-                                        pages);
-        iv_mmioMap[idx].addr = 0;
-        return 0;
-    }
-
-    return -EINVAL;
-}
 
 /**
  * @brief Map a device into the device segment(2TB)
diff --git a/src/kernel/syscall.C b/src/kernel/syscall.C
index b38c5e031..013ffc78c 100644
--- a/src/kernel/syscall.C
+++ b/src/kernel/syscall.C
@@ -113,9 +113,6 @@ namespace Systemcalls
         &MsgSendRecv,  // MSG_SENDRECV
         &MsgRespond,  // MSG_RESPOND
         &MsgWait,  // MSG_WAIT
-
-        &MmioMap,  // MMIO_MAP
-        &MmioUnmap,  // MMIO_UNMAP
         &DevMap,  // DEV_MAP
         &DevUnmap,  // DEV_UNMAP
 
@@ -414,22 +411,6 @@ namespace Systemcalls
         mq->lock.unlock();
     }
 
-    void MmioMap(task_t* t)
-    {
-        void* ra = (void*)TASK_GETARG0(t);
-        size_t pages = TASK_GETARG1(t);
-
-        TASK_SETRTN(t, (uint64_t) VmmManager::mmioMap(ra,pages));
-    }
-
-    void MmioUnmap(task_t* t)
-    {
-        void* ea = (void*)TASK_GETARG0(t);
-        size_t pages = TASK_GETARG1(t);
-
-        TASK_SETRTN(t, VmmManager::mmioUnmap(ea,pages));
-    }
-
     /**
      * Map a device into virtual memory
      * @param[in] t:  The task used to map a device
diff --git a/src/kernel/vmmmgr.C b/src/kernel/vmmmgr.C
index 5550b9ed5..b0fe28415 100644
--- a/src/kernel/vmmmgr.C
+++ b/src/kernel/vmmmgr.C
@@ -82,23 +82,6 @@ void VmmManager::flushPageTable( void )
     Singleton<VmmManager>::instance()._flushPageTable();
 }
 
-/**
- * STATIC
- * @brief DEPRECATED
- */
-void* VmmManager::mmioMap(void* ra, size_t pages)
-{
-    return DeviceSegment::mmioMap(ra, pages);
-}
-
-/**
- * STATIC
- * @brief DEPRECATED
- */
-int VmmManager::mmioUnmap(void* ea, size_t pages)
-{
-    return DeviceSegment::mmioUnmap(ea, pages);
-}
 
 /**
  * STATIC