Changeset 95108 in vbox for trunk/src/VBox/Devices

Timestamp:

May 25, 2022 8:35:20 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151589

Message:

Devices/Dev*: Replaced some leftover 'PDMBOTHCBDECL' usage with 'static DECLCALLBACK' (noexcept/c++17).

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevFlash.cpp (modified) (2 diffs)
• PC/DevRTC.cpp (modified) (2 diffs)
• Serial/DevOxPcie958.cpp (modified) (1 diff)
• Serial/DevSerial.cpp (modified) (1 diff)
• USB/DevOHCI.cpp (modified) (1 diff)

trunk/src/VBox/Devices/EFI/DevFlash.cpp

@@ -75 +75 @@
  * @callback_method_impl{FNIOMMMIONEWWRITE, Flash memory write}
  */
-PDMBOTHCBDECL(VBOXSTRICTRC) flashMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC) flashMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb)
 {
     PDEVFLASH pThis = PDMDEVINS_2_DATA(pDevIns, PDEVFLASH);
@@ -86 +86 @@
  * @callback_method_impl{FNIOMMMIONEWREAD, Flash memory read}
  */
-PDMBOTHCBDECL(VBOXSTRICTRC) flashMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC) flashMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, unsigned cb)
 {
     PDEVFLASH pThis = PDMDEVINS_2_DATA(pDevIns, PDEVFLASH);

trunk/src/VBox/Devices/PC/DevRTC.cpp

@@ -351 +351 @@
  * @callback_method_impl{FNIOMIOPORTNEWIN}
  */
-PDMBOTHCBDECL(VBOXSTRICTRC) rtcIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC) rtcIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb)
 {
     NOREF(pvUser);
@@ -417 +417 @@
  * @callback_method_impl{FNIOMIOPORTNEWOUT}
  */
-PDMBOTHCBDECL(VBOXSTRICTRC) rtcIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC) rtcIOPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb)
 {
     NOREF(pvUser);

trunk/src/VBox/Devices/Serial/DevOxPcie958.cpp

@@ -287 +287 @@
  * @param   iLvl        IRQ level requested.
  */
-PDMBOTHCBDECL(void) ox958IrqReq(PPDMDEVINS pDevIns, PUARTCORE pUart, unsigned iLUN, int iLvl)
+static DECLCALLBACK(void) ox958IrqReq(PPDMDEVINS pDevIns, PUARTCORE pUart, unsigned iLUN, int iLvl)
 {
     RT_NOREF(pUart);

trunk/src/VBox/Devices/Serial/DevSerial.cpp

@@ -104 +104 @@
 
 
-PDMBOTHCBDECL(void) serialIrqReq(PPDMDEVINS pDevIns, PUARTCORE pUart, unsigned iLUN, int iLvl)
+static DECLCALLBACK(void) serialIrqReq(PPDMDEVINS pDevIns, PUARTCORE pUart, unsigned iLUN, int iLvl)
 {
     RT_NOREF(pUart, iLUN);

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -5548 +5548 @@
  * @callback_method_impl{FNIOMMMIONEWWRITE}
  */
-PDMBOTHCBDECL(VBOXSTRICTRC) ohciMmioWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb)
+static DECLCALLBACK(VBOXSTRICTRC) ohciMmioWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb)
 {
     POHCI pThis = PDMDEVINS_2_DATA(pDevIns, POHCI);