diff --git a/libmaxsi/Makefile b/libmaxsi/Makefile
index bc52d066..51e7775d 100644
--- a/libmaxsi/Makefile
+++ b/libmaxsi/Makefile
@@ -36,7 +36,6 @@ _assert.o \
bsearch.o \
clearerr.o \
c++.o \
-crc32.o \
ctype.o \
dir.o \
error.o \
diff --git a/libmaxsi/include/libmaxsi/crc32.h b/libmaxsi/include/libmaxsi/crc32.h
deleted file mode 100644
index 2486d32d..00000000
--- a/libmaxsi/include/libmaxsi/crc32.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
-
- COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2012.
- COPYRIGHT(C) KRZYSZTOF DABROWSKI 1999, 2000.
- COPYRIGHT(C) ElysiuM deeZine 1999, 2000.
- Based on implementation by Finn Yannick Jacobs.
-
- This file is part of LibMaxsi.
-
- LibMaxsi is free software: you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
-
- LibMaxsi is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with LibMaxsi. If not, see .
-
- crc32.h
- Calculates a CRC32 Checksum of binary data.
-
-*******************************************************************************/
-
-#ifndef LIBMAXSI_CRC32_H
-#define LIBMAXSI_CRC32_H
-
-namespace Maxsi {
-namespace CRC32 {
-
-const uint32_t START_SEED = 0xFFFFFFFF;
-void GenerateTable(uint32_t tabel[256]);
-uint32_t Continue(uint32_t tabel[256], uint32_t crc, uint8_t* buf, size_t size);
-uint32_t Finish(uint32_t crc);
-uint32_t Hash(uint8_t* block, size_t size);
-
-} // namespace CRC32
-} // namespace Maxsi
-
-#endif
diff --git a/sortix/Makefile b/sortix/Makefile
index 5d5c9de2..60f66a45 100644
--- a/sortix/Makefile
+++ b/sortix/Makefile
@@ -85,6 +85,7 @@ HEADERS:=$(shell find include -type f)
OBJS=$(CPUOBJS) \
kernel.o \
+crc32.o \
interrupt.o \
worker.o \
time.o \
diff --git a/libmaxsi/crc32.cpp b/sortix/crc32.cpp
similarity index 58%
rename from libmaxsi/crc32.cpp
rename to sortix/crc32.cpp
index d59802a4..13cbc3aa 100644
--- a/libmaxsi/crc32.cpp
+++ b/sortix/crc32.cpp
@@ -1,34 +1,34 @@
/*******************************************************************************
- COPYRIGHT(C) JONAS 'SORTIE' TERMANSEN 2012.
- COPYRIGHT(C) KRZYSZTOF DABROWSKI 1999, 2000.
- COPYRIGHT(C) ElysiuM deeZine 1999, 2000.
+ Copyright(C) Jonas 'Sortie' Termansen 2012.
+ Copyright(C) Krzysztof Dabrowski 1999, 2000.
+ Copyright(C) ElysiuM deeZine 1999, 2000.
Based on implementation by Finn Yannick Jacobs.
- This file is part of LibMaxsi.
+ This file is part of Sortix.
- LibMaxsi is free software: you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
+ Sortix is free software: you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
- LibMaxsi is distributed in the hope that it will be useful, but WITHOUT ANY
+ Sortix is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
- You should have received a copy of the GNU Lesser General Public License
- along with LibMaxsi. If not, see .
+ You should have received a copy of the GNU General Public License along with
+ Sortix. If not, see .
crc32.cpp
Calculates a CRC32 Checksum of binary data.
*******************************************************************************/
-#include
-#include
+#include
+#include
-namespace Maxsi {
+namespace Sortix {
namespace CRC32 {
void GenerateTable(uint32_t tabel[256])
@@ -69,4 +69,4 @@ uint32_t Hash(uint8_t* block, size_t size)
}
} // namespace CRC32
-} // namespace Maxsi
+} // namespace Sortix
diff --git a/sortix/include/sortix/kernel/crc32.h b/sortix/include/sortix/kernel/crc32.h
new file mode 100644
index 00000000..914c567f
--- /dev/null
+++ b/sortix/include/sortix/kernel/crc32.h
@@ -0,0 +1,43 @@
+/*******************************************************************************
+
+ Copyright(C) Jonas 'Sortie' Termansen 2012.
+ Copyright(C) Krzysztof Dabrowski 1999, 2000.
+ Copyright(C) ElysiuM deeZine 1999, 2000.
+ Based on implementation by Finn Yannick Jacobs.
+
+ This file is part of Sortix.
+
+ Sortix is free software: you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+
+ Sortix is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ details.
+
+ You should have received a copy of the GNU General Public License along with
+ Sortix. If not, see .
+
+ crc32.h
+ Calculates a CRC32 Checksum of binary data.
+
+*******************************************************************************/
+
+#ifndef SORTIX_CRC32_H
+#define SORTIX_CRC32_H
+
+namespace Sortix {
+namespace CRC32 {
+
+const uint32_t START_SEED = 0xFFFFFFFF;
+void GenerateTable(uint32_t tabel[256]);
+uint32_t Continue(uint32_t tabel[256], uint32_t crc, uint8_t* buf, size_t size);
+uint32_t Finish(uint32_t crc);
+uint32_t Hash(uint8_t* block, size_t size);
+
+} // namespace CRC32
+} // namespace Sortix
+
+#endif
diff --git a/sortix/initrd.cpp b/sortix/initrd.cpp
index f7727e00..e56715d9 100644
--- a/sortix/initrd.cpp
+++ b/sortix/initrd.cpp
@@ -24,11 +24,11 @@
#include
#include
+#include
#include
#include
#include
#include
-#include
#include
#include
#include "initrd.h"