Commit e875c40a15e266a16ff6ef5c2ef686e0799166b7
1 parent
a98d49b1
indent fixes
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1140 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
17 additions
and
17 deletions
hw/dma.c
| @@ -63,17 +63,17 @@ static struct dma_cont { | @@ -63,17 +63,17 @@ static struct dma_cont { | ||
| 63 | } dma_controllers[2]; | 63 | } dma_controllers[2]; |
| 64 | 64 | ||
| 65 | enum { | 65 | enum { |
| 66 | - CMD_MEMORY_TO_MEMORY = 0x01, | ||
| 67 | - CMD_FIXED_ADDRESS = 0x02, | ||
| 68 | - CMD_BLOCK_CONTROLLER = 0x04, | ||
| 69 | - CMD_COMPRESSED_TIME = 0x08, | ||
| 70 | - CMD_CYCLIC_PRIORITY = 0x10, | ||
| 71 | - CMD_EXTENDED_WRITE = 0x20, | ||
| 72 | - CMD_LOW_DREQ = 0x40, | ||
| 73 | - CMD_LOW_DACK = 0x80, | ||
| 74 | - CMD_NOT_SUPPORTED = CMD_MEMORY_TO_MEMORY | CMD_FIXED_ADDRESS | ||
| 75 | - | CMD_COMPRESSED_TIME | CMD_CYCLIC_PRIORITY | CMD_EXTENDED_WRITE | ||
| 76 | - | CMD_LOW_DREQ | CMD_LOW_DACK | 66 | + CMD_MEMORY_TO_MEMORY = 0x01, |
| 67 | + CMD_FIXED_ADDRESS = 0x02, | ||
| 68 | + CMD_BLOCK_CONTROLLER = 0x04, | ||
| 69 | + CMD_COMPRESSED_TIME = 0x08, | ||
| 70 | + CMD_CYCLIC_PRIORITY = 0x10, | ||
| 71 | + CMD_EXTENDED_WRITE = 0x20, | ||
| 72 | + CMD_LOW_DREQ = 0x40, | ||
| 73 | + CMD_LOW_DACK = 0x80, | ||
| 74 | + CMD_NOT_SUPPORTED = CMD_MEMORY_TO_MEMORY | CMD_FIXED_ADDRESS | ||
| 75 | + | CMD_COMPRESSED_TIME | CMD_CYCLIC_PRIORITY | CMD_EXTENDED_WRITE | ||
| 76 | + | CMD_LOW_DREQ | CMD_LOW_DACK | ||
| 77 | 77 | ||
| 78 | }; | 78 | }; |
| 79 | 79 | ||
| @@ -228,13 +228,13 @@ static void write_cont (void *opaque, uint32_t nport, uint32_t data) | @@ -228,13 +228,13 @@ static void write_cont (void *opaque, uint32_t nport, uint32_t data) | ||
| 228 | #ifdef DEBUG_DMA | 228 | #ifdef DEBUG_DMA |
| 229 | { | 229 | { |
| 230 | int op, ai, dir, opmode; | 230 | int op, ai, dir, opmode; |
| 231 | - op = (data >> 2) & 3; | ||
| 232 | - ai = (data >> 4) & 1; | ||
| 233 | - dir = (data >> 5) & 1; | ||
| 234 | - opmode = (data >> 6) & 3; | 231 | + op = (data >> 2) & 3; |
| 232 | + ai = (data >> 4) & 1; | ||
| 233 | + dir = (data >> 5) & 1; | ||
| 234 | + opmode = (data >> 6) & 3; | ||
| 235 | 235 | ||
| 236 | - linfo ("ichan %d, op %d, ai %d, dir %d, opmode %d\n", | ||
| 237 | - ichan, op, ai, dir, opmode); | 236 | + linfo ("ichan %d, op %d, ai %d, dir %d, opmode %d\n", |
| 237 | + ichan, op, ai, dir, opmode); | ||
| 238 | } | 238 | } |
| 239 | #endif | 239 | #endif |
| 240 | d->regs[ichan].mode = data; | 240 | d->regs[ichan].mode = data; |