From f028a2e8337f1ed4059fc229e8a15303ecf3a5b6 Mon Sep 17 00:00:00 2001
From: Ben Sander <ben.sander@amd.com>
Date: Sat, 17 Sep 2016 08:40:47 -0500
Subject: [PATCH] Updates docs for hipHcc* functions, move to header

[ROCm/hip commit: 83140f8423c51f0e20082d0eb065106e87a27112]
---
 projects/hip/include/hcc_detail/hcc_acc.h | 4 ++++
 projects/hip/src/hip_hcc.cpp              | 6 ------
 projects/hip/src/hip_memory.cpp           | 1 +
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/projects/hip/include/hcc_detail/hcc_acc.h b/projects/hip/include/hcc_detail/hcc_acc.h
index d0d605d1c9..371a0a23a4 100644
--- a/projects/hip/include/hcc_detail/hcc_acc.h
+++ b/projects/hip/include/hcc_detail/hcc_acc.h
@@ -7,11 +7,15 @@
 #include <hc.hpp>
 /**
  * @brief Return hc::accelerator associated with the specified deviceId
+ * @return #hipSuccess, #hipErrorInvalidDevice
  */
 hipError_t hipHccGetAccelerator(int deviceId, hc::accelerator *acc);
 
 /**
  * @brief Return hc::accelerator_view associated with the specified stream
+ *
+ * If stream is 0, the accelerator_view for the default stream is returned.
+ * @return #hipSuccess
  */
 hipError_t hipHccGetAcceleratorView(hipStream_t stream, hc::accelerator_view **av);
 #endif
diff --git a/projects/hip/src/hip_hcc.cpp b/projects/hip/src/hip_hcc.cpp
index 0f0b03d115..f14b4612b8 100644
--- a/projects/hip/src/hip_hcc.cpp
+++ b/projects/hip/src/hip_hcc.cpp
@@ -1973,9 +1973,6 @@ void ihipStream_t::copyAsync(void* dst, const void* src, size_t sizeBytes, unsig
 //-------------------------------------------------------------------------------------------------
 // HCC-specific accessor functions:
 
-/**
- * @return #hipSuccess, #hipErrorInvalidDevice
- */
 //---
 hipError_t hipHccGetAccelerator(int deviceId, hc::accelerator *acc)
 {
@@ -1993,9 +1990,6 @@ hipError_t hipHccGetAccelerator(int deviceId, hc::accelerator *acc)
 }
 
 
-/**
- * @return #hipSuccess
- */
 //---
 hipError_t hipHccGetAcceleratorView(hipStream_t stream, hc::accelerator_view **av)
 {
diff --git a/projects/hip/src/hip_memory.cpp b/projects/hip/src/hip_memory.cpp
index 0cc53f7754..668852bbfe 100644
--- a/projects/hip/src/hip_memory.cpp
+++ b/projects/hip/src/hip_memory.cpp
@@ -613,6 +613,7 @@ hipError_t hipMemcpyDtoHAsync(void* dst, hipDeviceptr_t src, size_t sizeBytes, h
     return ihipLogStatus(e);
 }
 
+// TODO - review and optimize
 hipError_t hipMemcpy2D(void* dst, size_t dpitch, const void* src, size_t spitch,
         size_t width, size_t height, hipMemcpyKind kind) {