diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
commit | 9423a2e8dd362a271bfe194ec131062814557b95 (patch) | |
tree | 6b10b2d69e5d81b6ff4cb2ba75693d8a65362d92 /hw/gusemu.h | |
parent | da5361cc685c004d8bb4e7c5e7b3a52c7aca2c56 (diff) | |
parent | 126c79133f77d1b0b7c3849899c6d5f83b2fd410 (diff) | |
download | hqemu-9423a2e8dd362a271bfe194ec131062814557b95.zip hqemu-9423a2e8dd362a271bfe194ec131062814557b95.tar.gz |
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
Diffstat (limited to 'hw/gusemu.h')
-rw-r--r-- | hw/gusemu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/gusemu.h b/hw/gusemu.h index 5093767..331bb6f 100644 --- a/hw/gusemu.h +++ b/hw/gusemu.h @@ -27,7 +27,7 @@ /* data types (need to be adjusted if neither a VC6 nor a C99 compatible compiler is used) */ -#if defined _WIN32 && defined _MSC_VER /* doesnt support other win32 compilers yet, do it yourself... */ +#if defined _WIN32 && defined _MSC_VER /* doesn't support other win32 compilers yet, do it yourself... */ typedef unsigned char GUSbyte; typedef unsigned short GUSword; typedef unsigned int GUSdword; @@ -83,7 +83,7 @@ void gus_dma_transferdata(GUSEmuState *state, char *dma_addr, unsigned int count /* it is possible to break down a single transfer into multiple ones, but take care that: */ /* -dma_count is actually count-1 */ /* -before and during a transfer, DREQ is set and TC cleared */ -/* -when calling gus_dma_transferdata(), TC is only set true for call transfering the last byte */ +/* -when calling gus_dma_transferdata(), TC is only set true for call transferring the last byte */ /* -after the last transfer, DREQ is cleared and TC is set */ /* ** GF1 mixer emulation functions: */ |