Core:PXELINUX: pxelinux derivative merged succeesfully

So, now we have all the fs converted, and the rest is to make it better and more simple

3 files changed, 53 insertions, 56 deletions

diff --git a/core/include/core.h b/core/include/core.h
index f7a7262d..069354bb 100644
--- a/core/include/core.h
+++ b/core/include/core.h
@@ -29,4 +29,55 @@ void call16(void (*)(void), const com32sys_t *, com32sys_t *);
 
 #define __lowmem __attribute((nocommon,section(".lowmem")))
 
+/*
+ * externs for pxelinux
+ */
+extern void kaboom(void);
+extern void dns_mangle(void);
+
+extern uint32_t ServerIP;
+extern uint32_t MyIP;
+extern uint32_t Netmask;
+extern uint32_t Gateway;
+extern uint32_t ServerPort;
+
+extern char MACStr[];        /* MAC address as a string */
+extern char MAC[];           /* Actual MAC address */
+extern char BOOTIFStr[];     /* Space for "BOOTIF=" */
+extern uint8_t MACLen;       /* MAC address len */
+extern uint8_t MACType;      /* MAC address type */
+
+extern uint8_t  DHCPMagic;
+extern uint8_t  OverLoad;
+extern uint32_t RebootTime;
+
+/* TFTP ACK packet */
+extern uint16_t ack_packet_buf[];
+
+extern char trackbuf[];
+extern char BootFile[];
+extern char PathPrefix[];
+extern char LocalDomain[];
+
+extern char packet_buf[];
+
+extern char IPOption[];
+extern char DotQuadBuf[];
+
+extern uint32_t DNSServers[];
+extern uint16_t LastDNSServer;
+
+extern uint16_t RealBaseMem;
+extern uint16_t APIVer;
+extern far_ptr_t PXEEntry;
+
+extern far_ptr_t InitStack;
+
+extern int HaveUUID;
+extern uint8_t UUIDType;
+extern char UUID[];
+
+extern volatile uint16_t BIOS_timer;
+
+
 #endif /* CORE_H */
diff --git a/core/include/disk.h b/core/include/disk.h
index 0d8702db..91f7a57a 100644
--- a/core/include/disk.h
+++ b/core/include/disk.h
@@ -31,7 +31,7 @@ struct disk {
 };
 
 extern void read_sectors(char *, sector_t, int);
-extern void getoneblk(char *, block_t, int);
+extern void getoneblk(struct disk *, char *, block_t, int);
 
 /* diskio.c */
 struct disk *disk_init(uint8_t, bool, sector_t, uint16_t, uint16_t);
diff --git a/core/include/pxe.h b/core/include/pxe.h
index b9c71dfb..1aa05068 100644
--- a/core/include/pxe.h
+++ b/core/include/pxe.h
@@ -198,6 +198,7 @@
 #define TFTP_EOPTNEG	 htons(8)		// Option negotiation failure
 
 #define BOOTP_OPTION_MAGIC  htonl(0x63825363)
+#define MAC_MAX 32
 
 
 /*
@@ -300,61 +301,6 @@ struct gpxe_file_read {
     uint16_t buffer[2];
 } __attribute__ ((packed));
 
-/*
- * externs 
- */
-extern uint32_t ServerIP;
-extern uint32_t MyIP;
-extern uint32_t Netmask;
-extern uint32_t Gateway;
-extern uint32_t ServerPort;
-
-#define MAC_MAX 32
-extern char MACStr[];        /* MAC address as a string */
-extern char MAC[];           /* Actual MAC address */
-extern char BOOTIFStr[];     /* Space for "BOOTIF=" */
-extern uint8_t MACLen;       /* MAC address len */
-extern uint8_t MACType;      /* MAC address type */
-
-
-extern uint8_t  DHCPMagic;
-extern uint8_t  OverLoad;
-extern uint32_t RebootTime;
-
-
-/* TFTP ACK packet */
-extern uint16_t ack_packet_buf[];
-
-extern void kaboom(void);
-extern void dns_mangle(void);
-extern char trackbuf[];
-extern char BootFile[];
-extern char PathPrefix[];
-extern char CurrentDirName[];
-extern char LocalDomain[];
-
-extern char packet_buf[];
-
-extern char IPOption[];
-extern char DotQuadBuf[];
-
-
-extern uint32_t DNSServers[];
-extern uint16_t LastDNSServer;
-
-extern char ConfigName[];
-
-extern uint16_t RealBaseMem;
-extern uint16_t APIVer;
-extern far_ptr_t PXEEntry;
-
-extern far_ptr_t InitStack;
-
-extern int HaveUUID;
-extern uint8_t UUIDType;
-extern char UUID[];
-
-extern volatile uint16_t BIOS_timer;
 
 
 /*