From d236a9e348604605a808851f80d95a63b016374c Mon Sep 17 00:00:00 2001 From: Morten Delenk Date: Sat, 9 Dec 2017 19:38:23 +0000 Subject: [PATCH] fixed some stuff --- kernel/src/heap.cpp | 8 ++++---- kernel/src/include/pxi.hpp | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/kernel/src/heap.cpp b/kernel/src/heap.cpp index e3977ac..4b7bb07 100644 --- a/kernel/src/heap.cpp +++ b/kernel/src/heap.cpp @@ -7,15 +7,15 @@ void *operator new(size_t s) { void *operator new[](size_t s) { return (void*)(*pmm, (s+4095)/4096); } -void *operator delete(void *p) { +void operator delete(void *p) { (*pmm)((phys_t)p,1); } -void *operator delete[](void *p) { +void operator delete[](void *p) { (*pmm)((phys_t)p,1); } -void *operator delete(void *p, size_t s) { +void operator delete(void *p, size_t s) { (*pmm)((phys_t)p,(s+4095)/4096); } -void *operator delete[](void *p, size_t s) { +void operator delete[](void *p, size_t s) { (*pmm)((phys_t)p,(s+4095)/4096); } diff --git a/kernel/src/include/pxi.hpp b/kernel/src/include/pxi.hpp index cd864a4..2c876a1 100644 --- a/kernel/src/include/pxi.hpp +++ b/kernel/src/include/pxi.hpp @@ -1,5 +1,6 @@ #pragma once #include +#include struct PXIcmd { uint32_t conid; uint32_t cmdid; @@ -23,13 +24,11 @@ struct PXI { function pxi_handlers[16]; uint32_t connid; PXI(); - ~PXI(); void set_cmd_handler(uint32_t cmd, function handler); - void send_cmd(PXIcmd command, function callback); + void send_cmd(PXIcmd command, function callback); void main_loop(); - void }; extern PXI pxi;