Revision bee8d684 hw/sb16.c

b/hw/sb16.c
1257 1257
{
1258 1258
    SB16State *s = opaque;
1259 1259

  
1260
    qemu_put_be32s (f, &s->irq);
1261
    qemu_put_be32s (f, &s->dma);
1262
    qemu_put_be32s (f, &s->hdma);
1263
    qemu_put_be32s (f, &s->port);
1264
    qemu_put_be32s (f, &s->ver);
1265
    qemu_put_be32s (f, &s->in_index);
1266
    qemu_put_be32s (f, &s->out_data_len);
1267
    qemu_put_be32s (f, &s->fmt_stereo);
1268
    qemu_put_be32s (f, &s->fmt_signed);
1269
    qemu_put_be32s (f, &s->fmt_bits);
1260
    qemu_put_be32 (f, s->irq);
1261
    qemu_put_be32 (f, s->dma);
1262
    qemu_put_be32 (f, s->hdma);
1263
    qemu_put_be32 (f, s->port);
1264
    qemu_put_be32 (f, s->ver);
1265
    qemu_put_be32 (f, s->in_index);
1266
    qemu_put_be32 (f, s->out_data_len);
1267
    qemu_put_be32 (f, s->fmt_stereo);
1268
    qemu_put_be32 (f, s->fmt_signed);
1269
    qemu_put_be32 (f, s->fmt_bits);
1270 1270
    qemu_put_be32s (f, &s->fmt);
1271
    qemu_put_be32s (f, &s->dma_auto);
1272
    qemu_put_be32s (f, &s->block_size);
1273
    qemu_put_be32s (f, &s->fifo);
1274
    qemu_put_be32s (f, &s->freq);
1275
    qemu_put_be32s (f, &s->time_const);
1276
    qemu_put_be32s (f, &s->speaker);
1277
    qemu_put_be32s (f, &s->needed_bytes);
1278
    qemu_put_be32s (f, &s->cmd);
1279
    qemu_put_be32s (f, &s->use_hdma);
1280
    qemu_put_be32s (f, &s->highspeed);
1281
    qemu_put_be32s (f, &s->can_write);
1282
    qemu_put_be32s (f, &s->v2x6);
1271
    qemu_put_be32 (f, s->dma_auto);
1272
    qemu_put_be32 (f, s->block_size);
1273
    qemu_put_be32 (f, s->fifo);
1274
    qemu_put_be32 (f, s->freq);
1275
    qemu_put_be32 (f, s->time_const);
1276
    qemu_put_be32 (f, s->speaker);
1277
    qemu_put_be32 (f, s->needed_bytes);
1278
    qemu_put_be32 (f, s->cmd);
1279
    qemu_put_be32 (f, s->use_hdma);
1280
    qemu_put_be32 (f, s->highspeed);
1281
    qemu_put_be32 (f, s->can_write);
1282
    qemu_put_be32 (f, s->v2x6);
1283 1283

  
1284 1284
    qemu_put_8s (f, &s->csp_param);
1285 1285
    qemu_put_8s (f, &s->csp_value);
......
1288 1288
    qemu_put_buffer (f, s->csp_regs, 256);
1289 1289
    qemu_put_8s (f, &s->csp_index);
1290 1290
    qemu_put_buffer (f, s->csp_reg83, 4);
1291
    qemu_put_be32s (f, &s->csp_reg83r);
1292
    qemu_put_be32s (f, &s->csp_reg83w);
1291
    qemu_put_be32 (f, s->csp_reg83r);
1292
    qemu_put_be32 (f, s->csp_reg83w);
1293 1293

  
1294 1294
    qemu_put_buffer (f, s->in2_data, sizeof (s->in2_data));
1295 1295
    qemu_put_buffer (f, s->out_data, sizeof (s->out_data));
1296 1296
    qemu_put_8s (f, &s->test_reg);
1297 1297
    qemu_put_8s (f, &s->last_read_byte);
1298 1298

  
1299
    qemu_put_be32s (f, &s->nzero);
1300
    qemu_put_be32s (f, &s->left_till_irq);
1301
    qemu_put_be32s (f, &s->dma_running);
1302
    qemu_put_be32s (f, &s->bytes_per_second);
1303
    qemu_put_be32s (f, &s->align);
1299
    qemu_put_be32 (f, s->nzero);
1300
    qemu_put_be32 (f, s->left_till_irq);
1301
    qemu_put_be32 (f, s->dma_running);
1302
    qemu_put_be32 (f, s->bytes_per_second);
1303
    qemu_put_be32 (f, s->align);
1304 1304

  
1305
    qemu_put_be32s (f, &s->mixer_nreg);
1305
    qemu_put_be32 (f, s->mixer_nreg);
1306 1306
    qemu_put_buffer (f, s->mixer_regs, 256);
1307 1307
}
1308 1308

  
......
1314 1314
        return -EINVAL;
1315 1315
    }
1316 1316

  
1317
    qemu_get_be32s (f, &s->irq);
1318
    qemu_get_be32s (f, &s->dma);
1319
    qemu_get_be32s (f, &s->hdma);
1320
    qemu_get_be32s (f, &s->port);
1321
    qemu_get_be32s (f, &s->ver);
1322
    qemu_get_be32s (f, &s->in_index);
1323
    qemu_get_be32s (f, &s->out_data_len);
1324
    qemu_get_be32s (f, &s->fmt_stereo);
1325
    qemu_get_be32s (f, &s->fmt_signed);
1326
    qemu_get_be32s (f, &s->fmt_bits);
1317
    s->irq=qemu_get_be32 (f);
1318
    s->dma=qemu_get_be32 (f);
1319
    s->hdma=qemu_get_be32 (f);
1320
    s->port=qemu_get_be32 (f);
1321
    s->ver=qemu_get_be32 (f);
1322
    s->in_index=qemu_get_be32 (f);
1323
    s->out_data_len=qemu_get_be32 (f);
1324
    s->fmt_stereo=qemu_get_be32 (f);
1325
    s->fmt_signed=qemu_get_be32 (f);
1326
    s->fmt_bits=qemu_get_be32 (f);
1327 1327
    qemu_get_be32s (f, &s->fmt);
1328
    qemu_get_be32s (f, &s->dma_auto);
1329
    qemu_get_be32s (f, &s->block_size);
1330
    qemu_get_be32s (f, &s->fifo);
1331
    qemu_get_be32s (f, &s->freq);
1332
    qemu_get_be32s (f, &s->time_const);
1333
    qemu_get_be32s (f, &s->speaker);
1334
    qemu_get_be32s (f, &s->needed_bytes);
1335
    qemu_get_be32s (f, &s->cmd);
1336
    qemu_get_be32s (f, &s->use_hdma);
1337
    qemu_get_be32s (f, &s->highspeed);
1338
    qemu_get_be32s (f, &s->can_write);
1339
    qemu_get_be32s (f, &s->v2x6);
1328
    s->dma_auto=qemu_get_be32 (f);
1329
    s->block_size=qemu_get_be32 (f);
1330
    s->fifo=qemu_get_be32 (f);
1331
    s->freq=qemu_get_be32 (f);
1332
    s->time_const=qemu_get_be32 (f);
1333
    s->speaker=qemu_get_be32 (f);
1334
    s->needed_bytes=qemu_get_be32 (f);
1335
    s->cmd=qemu_get_be32 (f);
1336
    s->use_hdma=qemu_get_be32 (f);
1337
    s->highspeed=qemu_get_be32 (f);
1338
    s->can_write=qemu_get_be32 (f);
1339
    s->v2x6=qemu_get_be32 (f);
1340 1340

  
1341 1341
    qemu_get_8s (f, &s->csp_param);
1342 1342
    qemu_get_8s (f, &s->csp_value);
......
1345 1345
    qemu_get_buffer (f, s->csp_regs, 256);
1346 1346
    qemu_get_8s (f, &s->csp_index);
1347 1347
    qemu_get_buffer (f, s->csp_reg83, 4);
1348
    qemu_get_be32s (f, &s->csp_reg83r);
1349
    qemu_get_be32s (f, &s->csp_reg83w);
1348
    s->csp_reg83r=qemu_get_be32 (f);
1349
    s->csp_reg83w=qemu_get_be32 (f);
1350 1350

  
1351 1351
    qemu_get_buffer (f, s->in2_data, sizeof (s->in2_data));
1352 1352
    qemu_get_buffer (f, s->out_data, sizeof (s->out_data));
1353 1353
    qemu_get_8s (f, &s->test_reg);
1354 1354
    qemu_get_8s (f, &s->last_read_byte);
1355 1355

  
1356
    qemu_get_be32s (f, &s->nzero);
1357
    qemu_get_be32s (f, &s->left_till_irq);
1358
    qemu_get_be32s (f, &s->dma_running);
1359
    qemu_get_be32s (f, &s->bytes_per_second);
1360
    qemu_get_be32s (f, &s->align);
1356
    s->nzero=qemu_get_be32 (f);
1357
    s->left_till_irq=qemu_get_be32 (f);
1358
    s->dma_running=qemu_get_be32 (f);
1359
    s->bytes_per_second=qemu_get_be32 (f);
1360
    s->align=qemu_get_be32 (f);
1361 1361

  
1362
    qemu_get_be32s (f, &s->mixer_nreg);
1362
    s->mixer_nreg=qemu_get_be32 (f);
1363 1363
    qemu_get_buffer (f, s->mixer_regs, 256);
1364 1364

  
1365 1365
    if (s->voice) {

Also available in: Unified diff