attackgithub
diff --git a/‎src/Makefile‎
Lines changed: 6 additions & 13 deletions b/‎src/Makefile‎
Lines changed: 6 additions & 13 deletions
diff --git a/‎src/bootloader.asm‎ ‎src/boot/bootloader.asm‎src/bootloader.asm renamed to src/boot/bootloader.asm b/‎src/bootloader.asm‎ ‎src/boot/bootloader.asm‎src/bootloader.asm renamed to src/boot/bootloader.asm
diff --git a/‎src/interrupts.s‎ ‎src/kernel/interrupts.s‎src/interrupts.s renamed to src/kernel/interrupts.s b/‎src/interrupts.s‎ ‎src/kernel/interrupts.s‎src/interrupts.s renamed to src/kernel/interrupts.s
diff --git a/‎src/class_irq_manager.cpp‎ ‎src/kernel/irq_manager.cpp‎src/class_irq_manager.cpp renamed to src/kernel/irq_manager.cpp b/‎src/class_irq_manager.cpp‎ ‎src/kernel/irq_manager.cpp‎src/class_irq_manager.cpp renamed to src/kernel/irq_manager.cpp
diff --git a/‎src/kernel_start.cpp‎ ‎src/kernel/kernel_start.cpp‎src/kernel_start.cpp renamed to src/kernel/kernel_start.cpp b/‎src/kernel_start.cpp‎ ‎src/kernel/kernel_start.cpp‎src/kernel_start.cpp renamed to src/kernel/kernel_start.cpp
diff --git a/‎src/class_os.cpp‎ ‎src/kernel/os.cpp‎src/class_os.cpp renamed to src/kernel/os.cpp b/‎src/class_os.cpp‎ ‎src/kernel/os.cpp‎src/class_os.cpp renamed to src/kernel/os.cpp
diff --git a/‎src/class_pci_manager.cpp‎ ‎src/kernel/pci_manager.cpp‎src/class_pci_manager.cpp renamed to src/kernel/pci_manager.cpp b/‎src/class_pci_manager.cpp‎ ‎src/kernel/pci_manager.cpp‎src/class_pci_manager.cpp renamed to src/kernel/pci_manager.cpp
diff --git a/‎src/class_pit.cpp‎ ‎src/kernel/pit.cpp‎src/class_pit.cpp renamed to src/kernel/pit.cpp b/‎src/class_pit.cpp‎ ‎src/kernel/pit.cpp‎src/class_pit.cpp renamed to src/kernel/pit.cpp
diff --git a/‎src/syscalls.cpp‎ ‎src/kernel/syscalls.cpp‎src/syscalls.cpp renamed to src/kernel/syscalls.cpp b/‎src/syscalls.cpp‎ ‎src/kernel/syscalls.cpp‎src/syscalls.cpp renamed to src/kernel/syscalls.cpp
diff --git a/‎src/vga.cpp‎ ‎src/kernel/vga.cpp‎src/vga.cpp renamed to src/kernel/vga.cpp b/‎src/vga.cpp‎ ‎src/kernel/vga.cpp‎src/vga.cpp renamed to src/kernel/vga.cpp
@@ -31,22 +31,20 @@ WARNS   = -Wall -Wextra #-pedantic
 CCOPTS	= $(CAPABS) $(WARNS) -c -m32 -fno-stack-protector -fno-builtin -march=i686 $(INCLUDES)
 CPPOPTS = $(CAPABS) $(WARNS) -c -m32 -std=c++14 -fno-stack-protector $(INCLUDES)
 
-
 LDOPTS =  -nostdlib -melf_i386 -N --eh-frame-hdr --script=linker.ld #-flto
 
-
 # Objects
 ###################################################
 CXXABI     = $(shell find ./crt/cxxabi -type f -name "*.cpp")
 CXXABI_OBJ = $(CXXABI:.cpp=.o)
 
-OS_OBJECTS = kernel_start.o syscalls.o interrupts.o class_os.o \
+OS_OBJECTS = kernel/kernel_start.o kernel/syscalls.o kernel/interrupts.o kernel/os.o \
+						 kernel/irq_manager.o kernel/pci_manager.o kernel/pit.o \
 						 crt/c_abi.o crt/string.o crt/quick_exit.o crt/cxx_abi.o util/memstream.o \
-						 class_irq_manager.o class_pci_manager.o class_pit.o\
-						 hw/pic.o hw/class_pci_device.o hw/class_dev.o hw/cpu_freq_sampling.o\
+						 hw/pic.o hw/class_pci_device.o hw/class_dev.o hw/cpu_freq_sampling.o \
 						 virtio/class_virtio.o virtio/class_virtionet.o virtio/class_virtio_queue.o \
 						 net/class_ethernet.o net/inet.o net/class_inet.o net/class_arp.o net/class_ip4.o \
-						 net/class_udp.o net/class_tcp.o net/class_tcp_socket.o net/class_icmp.o net/class_inet4.o\
+						 net/class_udp.o net/class_tcp.o net/class_tcp_socket.o net/class_icmp.o net/class_inet4.o \
 						 net/ip6/ip6.o net/ip6/icmp6.o net/ip6/udp6.o net/ip6/ndp.o \
 						 net/class_packet.o net/dns/dns.o 
 
@@ -147,14 +145,9 @@ install: #os.a bootloader
 # Bootloader
 ###################################################
 # Nasm-based bootloader
-bootloader: bootloader.asm
+bootloader: boot/bootloader.asm
 	@echo "\n>> Assembling bootloader"
-	nasm -f bin -o bootloader bootloader.asm
-
-# Optional, for gcc-assembled bootloader
-bootloader_s: bootloader.s
-	$(CC) $(CCOPTS) -o $@ $<
-
+	nasm -f bin -o bootloader $<
 
 # Etags
 ###################################################