Mercurial > hg > Game > Cerium
changeset 1091:49f404f9d51c draft
minor fix
| author | yutaka@localhost.localdomain |
|---|---|
| date | Wed, 22 Dec 2010 08:04:58 +0900 |
| parents | c5797afaaff1 |
| children | b99abedb5523 |
| files | TaskManager/Cell/spe/CellDmaManager.cc TaskManager/kernel/ppe/TaskManagerImpl.h |
| diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Cell/spe/CellDmaManager.cc Wed Dec 22 08:00:42 2010 +0900 +++ b/TaskManager/Cell/spe/CellDmaManager.cc Wed Dec 22 08:04:58 2010 +0900 @@ -16,17 +16,16 @@ */ void CellDmaManager::dma_load(void *buf, memaddr addr, uint32 size, uint32 mask) { - /* + if ((unsigned long)addr&0xf) { printf("dma_load is not aligned. addr = 0x%lx, size = %d\n", (unsigned long)addr, size); return ; - } - */ + } + if (size == 0) return ; mfc_get((volatile void *)buf, addr, size, mask, 0, 0); - } /**
--- a/TaskManager/kernel/ppe/TaskManagerImpl.h Wed Dec 22 08:00:42 2010 +0900 +++ b/TaskManager/kernel/ppe/TaskManagerImpl.h Wed Dec 22 08:04:58 2010 +0900 @@ -7,7 +7,6 @@ #include "TaskQueue.h" #include "HTask.h" #include "Scheduler.h" -#include <malloc.h> class MemList; extern QueueInfo<TaskQueue> *taskQueuePool ;