diff --git a/LUFA.pnproj b/LUFA.pnproj index 2e485bc89d..77cc4a39de 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Projects/Webserver/Lib/FATFs/diskio.lst b/Projects/Webserver/Lib/FATFs/diskio.lst index 6553e4d2c1..0d545353e0 100644 --- a/Projects/Webserver/Lib/FATFs/diskio.lst +++ b/Projects/Webserver/Lib/FATFs/diskio.lst @@ -131,18 +131,18 @@ 214 .Letext0: DEFINED SYMBOLS *ABS*:00000000 diskio.c -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:2 *ABS*:0000003f __SREG__ -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:3 *ABS*:0000003e __SP_H__ -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:4 *ABS*:0000003d __SP_L__ -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:5 *ABS*:00000034 __CCP__ -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:6 *ABS*:00000000 __tmp_reg__ -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:7 *ABS*:00000001 __zero_reg__ -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:19 .text.disk_initialize:00000000 disk_initialize -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:35 .text.disk_status:00000000 disk_status -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:51 .text.disk_ioctl:00000000 disk_ioctl -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:74 .text.get_fattime:00000000 get_fattime -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:91 .text.disk_write:00000000 disk_write -C:\Users\Dean\AppData\Local\Temp/cci6lD6d.s:122 .text.disk_read:00000000 disk_read +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:2 *ABS*:0000003f __SREG__ +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:3 *ABS*:0000003e __SP_H__ +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:4 *ABS*:0000003d __SP_L__ +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:5 *ABS*:00000034 __CCP__ +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:6 *ABS*:00000000 __tmp_reg__ +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:7 *ABS*:00000001 __zero_reg__ +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:19 .text.disk_initialize:00000000 disk_initialize +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:35 .text.disk_status:00000000 disk_status +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:51 .text.disk_ioctl:00000000 disk_ioctl +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:74 .text.get_fattime:00000000 get_fattime +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:91 .text.disk_write:00000000 disk_write +C:\Users\Dean\AppData\Local\Temp/cczn3Odi.s:122 .text.disk_read:00000000 disk_read UNDEFINED SYMBOLS DataflashManager_WriteBlocks_RAM diff --git a/Projects/Webserver/Lib/FATFs/ff.lst b/Projects/Webserver/Lib/FATFs/ff.lst index 75598c4e62..0d091ff865 100644 --- a/Projects/Webserver/Lib/FATFs/ff.lst +++ b/Projects/Webserver/Lib/FATFs/ff.lst @@ -3031,26 +3031,26 @@ 3172 .Letext0: DEFINED SYMBOLS *ABS*:00000000 ff.c -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:2 *ABS*:0000003f __SREG__ -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:3 *ABS*:0000003e __SP_H__ -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:4 *ABS*:0000003d __SP_L__ -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:5 *ABS*:00000034 __CCP__ -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:6 *ABS*:00000000 __tmp_reg__ -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:7 *ABS*:00000001 __zero_reg__ -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:19 .text.clust2sect:00000000 clust2sect -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:101 .text.f_mount:00000000 f_mount +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:2 *ABS*:0000003f __SREG__ +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:3 *ABS*:0000003e __SP_H__ +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:4 *ABS*:0000003d __SP_L__ +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:5 *ABS*:00000034 __CCP__ +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:6 *ABS*:00000000 __tmp_reg__ +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:7 *ABS*:00000001 __zero_reg__ +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:19 .text.clust2sect:00000000 clust2sect +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:101 .text.f_mount:00000000 f_mount .bss:00000000 FatFs -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:144 .text.validate:00000000 validate -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:184 .text.f_close:00000000 f_close -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:218 .text.move_window:00000000 move_window -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:292 .text.get_fat:00000000 get_fat -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:545 .text.f_lseek:00000000 f_lseek -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:1021 .text.dir_seek:00000000 dir_seek -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:1270 .text.f_read:00000000 f_read -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:1694 .text.check_fs:00000000 check_fs -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:1779 .text.chk_mounted:00000000 chk_mounted -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:3058 .bss:00000002 Fsid -C:\Users\Dean\AppData\Local\Temp/ccSiGQ4w.s:2194 .text.f_open:00000000 f_open +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:144 .text.validate:00000000 validate +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:184 .text.f_close:00000000 f_close +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:218 .text.move_window:00000000 move_window +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:292 .text.get_fat:00000000 get_fat +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:545 .text.f_lseek:00000000 f_lseek +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:1021 .text.dir_seek:00000000 dir_seek +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:1270 .text.f_read:00000000 f_read +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:1694 .text.check_fs:00000000 check_fs +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:1779 .text.chk_mounted:00000000 chk_mounted +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:3058 .bss:00000002 Fsid +C:\Users\Dean\AppData\Local\Temp/ccuwpMso.s:2194 .text.f_open:00000000 f_open UNDEFINED SYMBOLS __mulsi3 diff --git a/Projects/Webserver/makefile b/Projects/Webserver/makefile index 3c72ad8750..ce4feaeac6 100644 --- a/Projects/Webserver/makefile +++ b/Projects/Webserver/makefile @@ -139,8 +139,8 @@ SRC = $(TARGET).c \ Lib/uip/timer.c \ Lib/uip/uip-neighbor.c \ Lib/uip/conf/clock-arch.c \ - Lib/FatFS/diskio.c \ - Lib/FatFS/ff.c \ + Lib/FATFs/diskio.c \ + Lib/FATFs/ff.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \