ide_disk.hh (11264:dc389d2d2f79) ide_disk.hh (12087:0e082672ac6b)
1/*
2 * Copyright (c) 2013 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 292 unchanged lines hidden (view full) ---

301 void startCommand();
302
303 // Interrupt management
304 void intrPost();
305 void intrClear();
306
307 // DMA stuff
308 void doDmaTransfer();
1/*
2 * Copyright (c) 2013 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 292 unchanged lines hidden (view full) ---

301 void startCommand();
302
303 // Interrupt management
304 void intrPost();
305 void intrClear();
306
307 // DMA stuff
308 void doDmaTransfer();
309 friend class EventWrapper<IdeDisk, &IdeDisk::doDmaTransfer>;
310 EventWrapper<IdeDisk, &IdeDisk::doDmaTransfer> dmaTransferEvent;
309 EventFunctionWrapper dmaTransferEvent;
311
312 void doDmaDataRead();
313
314 void doDmaRead();
315 ChunkGenerator *dmaReadCG;
310
311 void doDmaDataRead();
312
313 void doDmaRead();
314 ChunkGenerator *dmaReadCG;
316 friend class EventWrapper<IdeDisk, &IdeDisk::doDmaRead>;
317 EventWrapper<IdeDisk, &IdeDisk::doDmaRead> dmaReadWaitEvent;
315 EventFunctionWrapper dmaReadWaitEvent;
318
319 void doDmaDataWrite();
320
321 void doDmaWrite();
322 ChunkGenerator *dmaWriteCG;
316
317 void doDmaDataWrite();
318
319 void doDmaWrite();
320 ChunkGenerator *dmaWriteCG;
323 friend class EventWrapper<IdeDisk, &IdeDisk::doDmaWrite>;
324 EventWrapper<IdeDisk, &IdeDisk::doDmaWrite> dmaWriteWaitEvent;
321 EventFunctionWrapper dmaWriteWaitEvent;
325
326 void dmaPrdReadDone();
322
323 void dmaPrdReadDone();
327 friend class EventWrapper<IdeDisk, &IdeDisk::dmaPrdReadDone>;
328 EventWrapper<IdeDisk, &IdeDisk::dmaPrdReadDone> dmaPrdReadEvent;
324 EventFunctionWrapper dmaPrdReadEvent;
329
330 void dmaReadDone();
325
326 void dmaReadDone();
331 friend class EventWrapper<IdeDisk, &IdeDisk::dmaReadDone>;
332 EventWrapper<IdeDisk, &IdeDisk::dmaReadDone> dmaReadEvent;
327 EventFunctionWrapper dmaReadEvent;
333
334 void dmaWriteDone();
328
329 void dmaWriteDone();
335 friend class EventWrapper<IdeDisk, &IdeDisk::dmaWriteDone>;
336 EventWrapper<IdeDisk, &IdeDisk::dmaWriteDone> dmaWriteEvent;
330 EventFunctionWrapper dmaWriteEvent;
337
338 // Disk image read/write
339 void readDisk(uint32_t sector, uint8_t *data);
340 void writeDisk(uint32_t sector, uint8_t *data);
341
342 // State machine management
343 void updateState(DevAction_t action);
344

--- 29 unchanged lines hidden ---
331
332 // Disk image read/write
333 void readDisk(uint32_t sector, uint8_t *data);
334 void writeDisk(uint32_t sector, uint8_t *data);
335
336 // State machine management
337 void updateState(DevAction_t action);
338

--- 29 unchanged lines hidden ---