Annotation of /trunk/grub/patches/grub-0.97-netboot-compile-fixes.patch
Parent Directory | Revision Log
Revision 1092 -
(hide annotations)
(download)
Thu Aug 19 13:29:28 2010 UTC (14 years, 1 month ago) by niro
File size: 2693 byte(s)
Thu Aug 19 13:29:28 2010 UTC (14 years, 1 month ago) by niro
File size: 2693 byte(s)
-new patches
1 | niro | 1092 | diff -Naur grub-0.97/netboot/etherboot.h grub-0.97-magellan/netboot/etherboot.h |
2 | --- grub-0.97/netboot/etherboot.h 2003-07-09 13:45:37.000000000 +0200 | ||
3 | +++ grub-0.97-magellan/netboot/etherboot.h 2010-08-19 15:35:35.000000000 +0200 | ||
4 | @@ -531,9 +531,6 @@ | ||
5 | extern int network_ready; | ||
6 | extern struct rom_info rom; | ||
7 | extern struct arptable_t arptable[MAX_ARP]; | ||
8 | -extern struct bootpd_t bootp_data; | ||
9 | -#define BOOTP_DATA_ADDR (&bootp_data) | ||
10 | -extern unsigned char *end_of_rfc1533; | ||
11 | |||
12 | /* config.c */ | ||
13 | extern struct nic nic; | ||
14 | diff -Naur grub-0.97/netboot/main.c grub-0.97-magellan/netboot/main.c | ||
15 | --- grub-0.97/netboot/main.c 2004-05-21 00:19:33.000000000 +0200 | ||
16 | +++ grub-0.97-magellan/netboot/main.c 2010-08-19 15:37:15.000000000 +0200 | ||
17 | @@ -56,7 +56,8 @@ | ||
18 | static unsigned long netmask; | ||
19 | static struct bootpd_t bootp_data; | ||
20 | static unsigned long xid; | ||
21 | -static unsigned char *end_of_rfc1533 = NULL; | ||
22 | + | ||
23 | +#define BOOTP_DATA_ADDR (&bootp_data) | ||
24 | |||
25 | #ifndef NO_DHCP_SUPPORT | ||
26 | #endif /* NO_DHCP_SUPPORT */ | ||
27 | @@ -967,7 +968,6 @@ | ||
28 | |||
29 | if (block == 0) | ||
30 | { | ||
31 | - end_of_rfc1533 = NULL; | ||
32 | vendorext_isvalid = 0; | ||
33 | |||
34 | if (grub_memcmp (p, rfc1533_cookie, 4)) | ||
35 | @@ -1021,7 +1021,7 @@ | ||
36 | } | ||
37 | else if (c == RFC1533_END) | ||
38 | { | ||
39 | - end_of_rfc1533 = endp = p; | ||
40 | + endp = p; | ||
41 | continue; | ||
42 | } | ||
43 | else if (c == RFC1533_NETMASK) | ||
44 | diff -Naur grub-0.97/netboot/natsemi.c grub-0.97-magellan/netboot/natsemi.c | ||
45 | --- grub-0.97/netboot/natsemi.c 2003-07-09 13:45:38.000000000 +0200 | ||
46 | +++ grub-0.97-magellan/netboot/natsemi.c 2010-08-19 15:37:51.000000000 +0200 | ||
47 | @@ -608,7 +608,7 @@ | ||
48 | const char *p) /* Packet */ | ||
49 | { | ||
50 | u32 status, to, nstype; | ||
51 | - u32 tx_status; | ||
52 | + volatile u32 tx_status; | ||
53 | |||
54 | /* Stop the transmitter */ | ||
55 | outl(TxOff, ioaddr + ChipCmd); | ||
56 | @@ -647,7 +647,7 @@ | ||
57 | |||
58 | to = currticks() + TX_TIMEOUT; | ||
59 | |||
60 | - while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) | ||
61 | + while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) | ||
62 | /* wait */ ; | ||
63 | |||
64 | if (currticks() >= to) { | ||
65 | diff -Naur grub-0.97/netboot/sis900.c grub-0.97-magellan/netboot/sis900.c | ||
66 | --- grub-0.97/netboot/sis900.c 2003-07-09 13:45:38.000000000 +0200 | ||
67 | +++ grub-0.97-magellan/netboot/sis900.c 2010-08-19 15:38:26.000000000 +0200 | ||
68 | @@ -901,7 +901,7 @@ | ||
69 | const char *p) /* Packet */ | ||
70 | { | ||
71 | u32 status, to, nstype; | ||
72 | - u32 tx_status; | ||
73 | + volatile u32 tx_status; | ||
74 | |||
75 | /* Stop the transmitter */ | ||
76 | outl(TxDIS, ioaddr + cr); | ||
77 | @@ -940,7 +940,7 @@ | ||
78 | |||
79 | to = currticks() + TX_TIMEOUT; | ||
80 | |||
81 | - while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to)) | ||
82 | + while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to)) | ||
83 | /* wait */ ; | ||
84 | |||
85 | if (currticks() >= to) { |