Merge pull request #135 from xerpi/cpu_nids

Add more/fix SceCpuForKernel and SceCpuForDriver NIDs

1 files changed, 19 insertions, 11 deletions

diff --git a/include/kernel/kernel/cpu.h b/include/kernel/kernel/cpu.h
index 859424d..a4262ef 100644
--- a/include/kernel/kernel/cpu.h
+++ b/include/kernel/kernel/cpu.h
@@ -80,56 +80,64 @@ int sceKernelCpuDisableInterrupts(void);
 int sceKernelCpuEnableInterrupts(int flags);
 
 /**
- * @brief      Flush L1 dcache and L2
+ * @brief      Writeback a range of L1 dcache (without L2)
  *
- * Note: symbols currently does not work on 3.x, need to find new ones.
+ * @param      ptr   The pointer
+ * @param[in]  len   The length
+ *
+ * @return     Zero on success
+ */
+int sceKernelCpuDcacheWritebackRange(void *ptr, size_t len);
+
+/**
+ * @brief      Writeback and invalidate a range of L1 dcache (without L2)
  *
  * @param      ptr   The pointer
  * @param[in]  len   The length
  *
  * @return     Zero on success
  */
-int sceKernelCpuDcacheAndL2Flush(void *ptr, size_t len);
+int sceKernelCpuDcacheWritebackInvalidateRange(void *ptr, size_t len);
 
 /**
- * @brief      Flush L2 dcache without L2
+ * @brief      Writeback a range of L1 dcache and L2
  *
  * @param      ptr   The pointer
  * @param[in]  len   The length
  *
  * @return     Zero on success
  */
-int sceKernelCpuDcacheFlush(void *ptr, size_t len);
+int sceKernelCpuDcacheAndL2WritebackRange(void *ptr, size_t len);
 
 /**
- * @brief      Writeback a range of L1 dcache (not sure if L2 too)
+ * @brief      Writeback and invalidate a range of L1 and L2 dcache
  *
  * @param      ptr   The pointer
  * @param[in]  len   The length
  *
  * @return     Zero on success
  */
-int sceKernelCpuDcacheWritebackRange(void *ptr, size_t len);
+int sceKernelCpuDcacheAndL2InvalidateRange(void *ptr, size_t len);
 
 /**
- * @brief      Flush L1 icache and L2
+ * @brief      Writeback and invalidate a range of L1 icache and L2
  *
  * @param      ptr   The pointer
  * @param[in]  len   The length
  *
  * @return     Zero on success
  */
-int sceKernelCpuIcacheAndL2Flush(void *ptr, size_t len);
+int sceKernelCpuIcacheAndL2WritebackInvalidateRange(void *ptr, size_t len);
 
 /**
- * @brief      Flush L1 dcache and L2 for DMA operations
+ * @brief      Writeback and invalidate a range of L1 dcache and L2
  *
  * @param      ptr   The pointer
  * @param[in]  len   The length
  *
  * @return     Zero on success
  */
-int sceKernelCpuDcacheAndL2AndDMAFlush(void *ptr, size_t len);
+int sceKernelCpuDcacheAndL2WritebackInvalidateRange(void *ptr, size_t len);
 
 /**
  * @brief      MMU permission bypassing memcpy