DMA Compile Issue commit 621d85d

[darksabre76]

Hello all. I just pulled the most recent source and I cannot get it to build. It seems like "dma.stat_rq" is missing from the dma struct. Not sure if this will be coming in a future commit or if I'm doing something wrong (which is equally, if not more, likely). Below is the full text of the compile error:

Code: Select all

gcc -O3 -march=i686 -fomit-frame-pointer -msse2 -mstackrealign -Werror -fno-strict-aliasing -DUSE_NETWORKING -IC:/Users/Matt/Downloads/PCemBuild/mingw32/lib/wx/include/msw-unicode-3.0 -IC:/Users/Matt/Downloads/PCemBuild/mingw32/include/wx-3.0 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXMSW__ -mthreads -c dma.c
dma.c: In function 'dma_ps2_read':
dma.c:171:46: error: 'DMA {aka struct DMA}' has no member named 'stat_rq'; did you mean 'stat'?
                                 temp = dma16.stat_rq | (dma16.stat << 4);
                                              ^~~~~~~
                                              stat
dma.c:173:39: error: 'DMA {aka struct DMA}' has no member named 'stat_rq'; did you mean 'stat'?
                                 dma16.stat_rq = 0;
                                       ^~~~~~~
                                       stat
dma.c:177:44: error: 'DMA {aka struct DMA}' has no member named 'stat_rq'; did you mean 'stat'?
                                 temp = dma.stat_rq | (dma.stat << 4);
                                            ^~~~~~~
                                            stat
dma.c:179:37: error: 'DMA {aka struct DMA}' has no member named 'stat_rq'; did you mean 'stat'?
                                 dma.stat_rq = 0;
                                     ^~~~~~~
                                     stat
dma.c: In function 'dma_channel_read':
dma.c:523:21: error: 'DMA {aka struct DMA}' has no member named 'stat_rq'; did you mean 'stat'?
                 dma.stat_rq |= (1 << channel);
                     ^~~~~~~
                     stat
dma.c:567:23: error: 'DMA {aka struct DMA}' has no member named 'stat_rq'; did you mean 'stat'?
                 dma16.stat_rq |= (1 << channel);
                       ^~~~~~~
                       stat
dma.c: In function 'dma_channel_write':
dma.c:620:21: error: 'DMA {aka struct DMA}' has no member named 'stat_rq'; did you mean 'stat'?
                 dma.stat_rq |= (1 << channel);
                     ^~~~~~~
                     stat
dma.c:663:23: error: 'DMA {aka struct DMA}' has no member named 'stat_rq'; did you mean 'stat'?
                 dma16.stat_rq |= (1 << channel);
                       ^~~~~~~
                       stat
mingw32-make: *** [Makefile.msys2-wx-sdl2-network:52: dma.o] Error 1

[shermanp]

You aren't doing anything wrong.

The DMA struct is defined in "ibm.h", and does not include the "stat_rq" member. It's either a typo, or Sarah forgot to update the DMA struct. I'm sure she'll fix it either way.

[SarahWalker]

My bad. Fixed in rev 951.

[darksabre76]

Thank you! I hadn't had a compile issue previously, so I was a bit concerned that I had broken my build system...