Mercurial > hg > Game > Cerium
changeset 1219:a27c361c436b draft
add ReferencedDmaManager.cc
| author | Daichi TOMA <e085740@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sat, 23 Jul 2011 06:17:08 +0900 |
| parents | 195e21a1b63c |
| children | 5d62049098bc |
| files | TaskManager/Fifo/MainScheduler.cc TaskManager/Fifo/ReferencedDmaManager.cc TaskManager/Fifo/ReferencedDmaManager.h TaskManager/kernel/schedule/SchedTaskList.cc |
| diffstat | 4 files changed, 26 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Fifo/MainScheduler.cc Fri Jul 22 23:08:16 2011 +0900 +++ b/TaskManager/Fifo/MainScheduler.cc Sat Jul 23 06:17:08 2011 +0900 @@ -1,14 +1,15 @@ #include <stdlib.h> #include <string.h> #include "MainScheduler.h" -#include "FifoDmaManager.h" #include "TaskManagerImpl.h" +#include "ReferencedDmaManager.h" #include "error.h" void MainScheduler::init_impl(void) { - fifoDmaManager = new FifoDmaManager(); + //fifoDmaManager = new FifoDmaManager(); + fifoDmaManager = new ReferencedDmaManager(); connector = fifoDmaManager; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/TaskManager/Fifo/ReferencedDmaManager.cc Sat Jul 23 06:17:08 2011 +0900 @@ -0,0 +1,9 @@ +#include "ReferencedDmaManager.h" +#include "Scheduler.h" +#include "TaskManagerImpl.h" + +void * +ReferencedDmaManager::dma_load(Scheduler *s, void *buf, memaddr addr, uint32 size, uint32 mask) +{ + return (void*)addr; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/TaskManager/Fifo/ReferencedDmaManager.h Sat Jul 23 06:17:08 2011 +0900 @@ -0,0 +1,13 @@ +#ifndef INCLUDED_REFERENCED_DMA_MANAGER +#define INCLUDED_REFERENCED_DMA_MANAGER + +#include "FifoDmaManager.h" + +class ReferencedDmaManager : public FifoDmaManager { + +public: + /* functions */ + void *dma_load(Scheduler *s, void *buf, memaddr addr, uint32 size, uint32 mask); +} ; + +#endif/* REFERENCED_DMA_MANAGER */
--- a/TaskManager/kernel/schedule/SchedTaskList.cc Fri Jul 22 23:08:16 2011 +0900 +++ b/TaskManager/kernel/schedule/SchedTaskList.cc Sat Jul 23 06:17:08 2011 +0900 @@ -27,7 +27,7 @@ cur_index = 0; list = scheduler->get_curListBuf(); connector = scheduler->connector; - connector->dma_load(0, list, params_addr, + list = (TaskListPtr)connector->dma_load(0, list, params_addr, sizeof(TaskList), DMA_READ_TASKLIST); this->tag = tag;