aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2011-04-09 18:19:51 -0700
committerEric W. Biederman <ebiederm@xmission.com>2011-04-09 21:18:08 -0700
commitf39650e2552da4f1508a857db19d8a1e0a01a054 (patch)
tree36fae73a7ae86900bd953ff9b9643036d4b25fcd
parent6b700781de77031b82a0b22744a234dc21acfce4 (diff)
downloadsyslinux-devel-f39650e2552da4f1508a857db19d8a1e0a01a054.tar.gz
syslinux-devel-f39650e2552da4f1508a857db19d8a1e0a01a054.tar.xz
syslinux-devel-f39650e2552da4f1508a857db19d8a1e0a01a054.zip
-rw-r--r--Makefile4
-rw-r--r--core/fs/pxe/pxe.c6
-rw-r--r--core/lwip/src/netif/undiif.c22
3 files changed, 23 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 60a59560..bdb17336 100644
--- a/Makefile
+++ b/Makefile
@@ -42,10 +42,12 @@ BOBJECTS = $(BTARGET) \
mbr/*.bin \
core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
gpxe/gpxelinux.0 dos/syslinux.com \
- win32/syslinux.exe win64/syslinux64.exe \
+ win32/syslinux.exe \
dosutil/*.com dosutil/*.sys \
$(MODULES)
+#win64/syslinux64.exe \
+
# BSUBDIRs build the on-target binary components.
# ISUBDIRs build the installer (host) components.
#
diff --git a/core/fs/pxe/pxe.c b/core/fs/pxe/pxe.c
index 47c0645b..1c5ffb2d 100644
--- a/core/fs/pxe/pxe.c
+++ b/core/fs/pxe/pxe.c
@@ -1184,7 +1184,7 @@ static void network_init(void)
DHCPMagic = 0;
#if 1 /* new stuff */
- dprintf("undi_tcpip_start...\n");
+ printf("undi_tcpip_start...\n");
extern err_t undi_tcpip_start(struct ip_addr *ipaddr,
struct ip_addr *netmask,
struct ip_addr *gw);
@@ -1194,7 +1194,7 @@ static void network_init(void)
for (i = 0; i < DNS_MAX_SERVERS; i++) {
/* Transfer the DNS information to lwip */
- dprintf("DNS server %d = %d.%d.%d.%d\n",
+ printf("DNS server %d = %d.%d.%d.%d\n",
i,
((uint8_t *)&dns_server[i])[0],
((uint8_t *)&dns_server[i])[1],
@@ -1203,7 +1203,7 @@ static void network_init(void)
dns_setserver(i, (struct ip_addr *)&dns_server[i]);
}
- dprintf("lwip_test...\n");
+ printf("lwip_test...\n");
lwip_test();
#else
udp_init();
diff --git a/core/lwip/src/netif/undiif.c b/core/lwip/src/netif/undiif.c
index 1baeb975..20c90681 100644
--- a/core/lwip/src/netif/undiif.c
+++ b/core/lwip/src/netif/undiif.c
@@ -107,7 +107,7 @@ low_level_init(struct netif *netif)
pxe_call(PXENV_UNDI_GET_INFORMATION, &undi_info);
- dprintf("UNDI: baseio %04x int %d MTU %d type %d\n",
+ printf("UNDI: baseio %04x int %d MTU %d type %d\n",
undi_info.BaseIo, undi_info.IntNumber, undi_info.MaxTranUnit,
undi_info.HwType);
@@ -120,10 +120,10 @@ low_level_init(struct netif *netif)
/* maximum transfer unit */
netif->mtu = undi_info.MaxTranUnit;
- dprintf("UNDI: hw address");
+ printf("UNDI: hw address");
for (i = 0; i < netif->hwaddr_len; i++)
- dprintf("%c%02x", i ? ':' : ' ', (uint8_t)netif->hwaddr[i]);
- dprintf("\n");
+ printf("%c%02x", i ? ':' : ' ', (uint8_t)netif->hwaddr[i]);
+ printf("\n");
/* device capabilities */
/* don't set NETIF_FLAG_ETHARP if this device is not an ethernet one */
@@ -187,6 +187,18 @@ low_level_output(struct netif *netif, struct pbuf *p)
}
//printf("undiif_output, len = %d ", r - pkt_buf);
+#if 0
+ {
+ char *p;
+ for (p = pkt_buf; p < r; p++) {
+ if (((p - pkt_buf) & 0xf) == 0) {
+ printf("\n%04x: ", p - pkt_buf);
+ }
+ printf("%02x ", *((unsigned char *)p));
+ }
+ printf("\n");
+ }
+#endif
do {
memset(&pxe, 0, sizeof pxe);
@@ -403,7 +415,7 @@ err_t undi_tcpip_start(struct ip_addr *ipaddr,
// This should be done *after* the threading system and receive thread
// have both been started.
- dprintf("undi_netif: ip %d.%d.%d.%d netmask %d.%d.%d.%d gw %d.%d.%d.%d\n",
+ printf("undi_netif: ip %d.%d.%d.%d netmask %d.%d.%d.%d gw %d.%d.%d.%d\n",
((uint8_t *)ipaddr)[0],
((uint8_t *)ipaddr)[1],
((uint8_t *)ipaddr)[2],