Commit 9e64fa8
committed
[FREELDR:XBOX] Fix compilation dependencies and linking for the XBOX build (reactos#8510)
CORE-16216
machpc.c:
- Surround more PC-specific routines in `#if !defined(SARCH_XBOX)`,
so that they aren't compiled for XBOX.
- In particular since commit 246f2d2 (PR reactos#8418), the PC-specific
`DiskGetConfigType()` was compiled at the same time as the XBOX one.
This is now fixed.
machxbox.c
- Add a dummy `ChainLoadBiosBootSectorCode()` to make freeldr exports working.
xboxdisk.c
- Minimal Disk I/O error support routines.
- Add a dummy `DiskResetController()`, invoked in pchw.c
- Add a dummy `DiskStopFloppyMotor()`, needed for entry.S/linux.S
miscboot.c
- Still compile `LoadAndBootSector()` (avoids lots of changes elsewhere),
but display an error message if it's run, and directly return with an error.
pcat.cmake
- Remove unnecessary dependencies on pcdisk.c and pcvesa.c1 parent f7aa250 commit 9e64fa8
File tree
5 files changed
+91
-11
lines changed- boot/freeldr/freeldr
- arch/i386
- pc
- xbox
5 files changed
+91
-11
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
103 | 106 | | |
104 | 107 | | |
105 | 108 | | |
| |||
385 | 388 | | |
386 | 389 | | |
387 | 390 | | |
| 391 | + | |
| 392 | + | |
388 | 393 | | |
389 | 394 | | |
390 | 395 | | |
| |||
711 | 716 | | |
712 | 717 | | |
713 | 718 | | |
| 719 | + | |
| 720 | + | |
714 | 721 | | |
715 | 722 | | |
716 | 723 | | |
| |||
728 | 735 | | |
729 | 736 | | |
730 | 737 | | |
| 738 | + | |
731 | 739 | | |
732 | 740 | | |
733 | 741 | | |
| |||
880 | 888 | | |
881 | 889 | | |
882 | 890 | | |
| 891 | + | |
| 892 | + | |
| 893 | + | |
883 | 894 | | |
884 | 895 | | |
885 | 896 | | |
| |||
971 | 982 | | |
972 | 983 | | |
973 | 984 | | |
| 985 | + | |
| 986 | + | |
974 | 987 | | |
975 | 988 | | |
976 | 989 | | |
| |||
1172 | 1185 | | |
1173 | 1186 | | |
1174 | 1187 | | |
| 1188 | + | |
| 1189 | + | |
| 1190 | + | |
1175 | 1191 | | |
1176 | 1192 | | |
1177 | 1193 | | |
| |||
1672 | 1688 | | |
1673 | 1689 | | |
1674 | 1690 | | |
1675 | | - | |
1676 | | - | |
1677 | 1691 | | |
1678 | 1692 | | |
1679 | 1693 | | |
| |||
1685 | 1699 | | |
1686 | 1700 | | |
1687 | 1701 | | |
1688 | | - | |
1689 | 1702 | | |
1690 | 1703 | | |
1691 | 1704 | | |
| |||
1768 | 1781 | | |
1769 | 1782 | | |
1770 | 1783 | | |
| 1784 | + | |
| 1785 | + | |
| 1786 | + | |
1771 | 1787 | | |
1772 | 1788 | | |
1773 | 1789 | | |
| |||
1813 | 1829 | | |
1814 | 1830 | | |
1815 | 1831 | | |
1816 | | - | |
| 1832 | + | |
1817 | 1833 | | |
1818 | 1834 | | |
1819 | 1835 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
290 | 290 | | |
291 | 291 | | |
292 | 292 | | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
293 | 300 | | |
294 | 301 | | |
295 | 302 | | |
| |||
372 | 379 | | |
373 | 380 | | |
374 | 381 | | |
375 | | - | |
| 382 | + | |
376 | 383 | | |
377 | | - | |
378 | | - | |
379 | | - | |
380 | 384 | | |
381 | 385 | | |
382 | 386 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
23 | 64 | | |
24 | 65 | | |
25 | 66 | | |
| |||
77 | 118 | | |
78 | 119 | | |
79 | 120 | | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
80 | 128 | | |
81 | 129 | | |
82 | 130 | | |
| |||
93 | 141 | | |
94 | 142 | | |
95 | 143 | | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
96 | 150 | | |
97 | 151 | | |
98 | 152 | | |
| |||
101 | 155 | | |
102 | 156 | | |
103 | 157 | | |
| 158 | + | |
104 | 159 | | |
105 | 160 | | |
106 | 161 | | |
| |||
109 | 164 | | |
110 | 165 | | |
111 | 166 | | |
112 | | - | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
113 | 171 | | |
114 | 172 | | |
115 | 173 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
41 | 45 | | |
42 | 46 | | |
43 | 47 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
73 | 72 | | |
74 | 73 | | |
75 | | - | |
76 | 74 | | |
77 | 75 | | |
78 | 76 | | |
| |||
0 commit comments