いらない変数の削除
コンソールタスクの登録を新機構に変更
bitnos5/trunk/kernel/boot.cpp (diff)| @@ -108,7 +108,6 @@ | ||
| 108 | 108 | Image imageVram((uint16_t*)binfo->vramaddr, binfo->xsize, binfo->ysize); |
| 109 | 109 | |
| 110 | 110 | char s[128]; |
| 111 | - int inputXPos = 0; | |
| 112 | 111 | |
| 113 | 112 | Point mpos; // マウス座標 |
| 114 | 113 | mpos = Point(binfo->xsize / 2, binfo->ysize / 2); |
| @@ -234,7 +233,7 @@ | ||
| 234 | 233 | */ |
| 235 | 234 | |
| 236 | 235 | Timer* tim1 = timman->Alloc(task, 1); |
| 237 | - tim1->SetTime(500); | |
| 236 | + tim1->SetTime(50); | |
| 238 | 237 | |
| 239 | 238 | sheettest->SetParentTask(taskman->GetCurrentTask()); |
| 240 | 239 |
| @@ -288,17 +287,16 @@ | ||
| 288 | 287 | } else if (msg->from == Message::From::Timer) { |
| 289 | 288 | if (msg->arg1 == 1) { |
| 290 | 289 | //tim1->SetTime(500); |
| 291 | - Debug::WriteLine("from timer : tim1 (5sec)"); | |
| 292 | - | |
| 293 | 290 | Task* consTask = taskman->Alloc(); |
| 294 | - consTask->SetEipEsp( | |
| 295 | - (uint32_t)&TaskConsoleFunc, | |
| 296 | - (uint32_t)((new uint8_t[1024*4]) + 1024*4) | |
| 297 | - ); | |
| 291 | + uintptr_t stackTop; | |
| 292 | + uint32_t stackSize; | |
| 293 | + stackTop = (uintptr_t)(new uint8_t[stackSize = 1024*4]); | |
| 294 | + consTask->SetFuncs(stackTop, stackSize, | |
| 295 | + TaskConsole::Init, DummyFunc, TaskConsole::Proc); | |
| 298 | 296 | consTask->InitQueue(128); |
| 299 | 297 | taskman->Run(consTask, 1, 2); |
| 300 | 298 | } else if (msg->arg1 == 2) { |
| 301 | - Debug::WriteLine("timCursor timeup"); | |
| 299 | + //Debug::WriteLine("timCursor timeup"); | |
| 302 | 300 | if (active) { |
| 303 | 301 | timCursor->SetTime(50); |
| 304 | 302 | timCursor->SetTime(50); |
