Changeset 64369 in vbox for trunk/src/VBox/Devices/PC/DevPit-i8254.cpp
- Timestamp:
- Oct 22, 2016 6:19:08 PM (8 years ago)
- svn:sync-xref-src-repo-rev:
- 111474
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/PC/DevPit-i8254.cpp
r63435 r64369 649 649 * @callback_method_impl{FNIOMIOPORTIN} 650 650 */ 651 PDMBOTHCBDECL(int) pitIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)652 { 653 Log2(("pitIOPortRead: Port=%#x cb=%x\n",Port, cb));651 PDMBOTHCBDECL(int) pitIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb) 652 { 653 Log2(("pitIOPortRead: uPort=%#x cb=%x\n", uPort, cb)); 654 654 NOREF(pvUser); 655 Port &= 3;656 if (cb != 1 || Port == 3)657 { 658 Log(("pitIOPortRead: Port=%#x cb=%x *pu32=unused!\n",Port, cb));655 uPort &= 3; 656 if (cb != 1 || uPort == 3) 657 { 658 Log(("pitIOPortRead: uPort=%#x cb=%x *pu32=unused!\n", uPort, cb)); 659 659 return VERR_IOM_IOPORT_UNUSED; 660 660 } 661 661 662 662 PPITSTATE pThis = PDMINS_2_DATA(pDevIns, PPITSTATE); 663 PPITCHANNEL pChan = &pThis->channels[ Port];663 PPITCHANNEL pChan = &pThis->channels[uPort]; 664 664 int ret; 665 665 … … 722 722 723 723 *pu32 = ret; 724 Log2(("pitIOPortRead: Port=%#x cb=%x *pu32=%#04x\n",Port, cb, *pu32));724 Log2(("pitIOPortRead: uPort=%#x cb=%x *pu32=%#04x\n", uPort, cb, *pu32)); 725 725 return VINF_SUCCESS; 726 726 } … … 730 730 * @callback_method_impl{FNIOMIOPORTOUT} 731 731 */ 732 PDMBOTHCBDECL(int) pitIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)733 { 734 Log2(("pitIOPortWrite: Port=%#x cb=%x u32=%#04x\n",Port, cb, u32));732 PDMBOTHCBDECL(int) pitIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb) 733 { 734 Log2(("pitIOPortWrite: uPort=%#x cb=%x u32=%#04x\n", uPort, cb, u32)); 735 735 NOREF(pvUser); 736 736 if (cb != 1) … … 738 738 739 739 PPITSTATE pThis = PDMINS_2_DATA(pDevIns, PPITSTATE); 740 Port &= 3;741 if ( Port == 3)740 uPort &= 3; 741 if (uPort == 3) 742 742 { 743 743 /* … … 820 820 * Port 40-42h - Channel Data Ports. 821 821 */ 822 PPITCHANNEL pChan = &pThis->channels[ Port];822 PPITCHANNEL pChan = &pThis->channels[uPort]; 823 823 DEVPIT_LOCK_BOTH_RETURN(pThis, VINF_IOM_R3_IOPORT_WRITE); 824 824 switch (pChan->write_state) … … 850 850 * @callback_method_impl{FNIOMIOPORTIN, Speaker} 851 851 */ 852 PDMBOTHCBDECL(int) pitIOPortSpeakerRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)853 { 854 RT_NOREF2(pvUser, Port);852 PDMBOTHCBDECL(int) pitIOPortSpeakerRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb) 853 { 854 RT_NOREF2(pvUser, uPort); 855 855 if (cb == 1) 856 856 { … … 884 884 | (fRefresh << 4) 885 885 | (fOut << 5); 886 Log(("pitIOPortSpeakerRead: Port=%#x cb=%x *pu32=%#x\n",Port, cb, *pu32));886 Log(("pitIOPortSpeakerRead: uPort=%#x cb=%x *pu32=%#x\n", uPort, cb, *pu32)); 887 887 return VINF_SUCCESS; 888 888 } 889 Log(("pitIOPortSpeakerRead: Port=%#x cb=%x *pu32=unused!\n",Port, cb));889 Log(("pitIOPortSpeakerRead: uPort=%#x cb=%x *pu32=unused!\n", uPort, cb)); 890 890 return VERR_IOM_IOPORT_UNUSED; 891 891 } … … 896 896 * @callback_method_impl{FNIOMIOPORTOUT, Speaker} 897 897 */ 898 PDMBOTHCBDECL(int) pitIOPortSpeakerWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)899 { 900 RT_NOREF2(pvUser, Port);898 PDMBOTHCBDECL(int) pitIOPortSpeakerWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb) 899 { 900 RT_NOREF2(pvUser, uPort); 901 901 if (cb == 1) 902 902 { … … 992 992 DEVPIT_UNLOCK_BOTH(pThis); 993 993 } 994 Log(("pitIOPortSpeakerWrite: Port=%#x cb=%x u32=%#x\n",Port, cb, u32));994 Log(("pitIOPortSpeakerWrite: uPort=%#x cb=%x u32=%#x\n", uPort, cb, u32)); 995 995 return VINF_SUCCESS; 996 996 }
Note:
See TracChangeset
for help on using the changeset viewer.