AMMediaboard: Adjust the verbosity of many LOG entries.

1 files changed, 27 insertions, 27 deletions

diff --git a/Source/Core/Core/HW/DVD/AMMediaboard.cpp b/Source/Core/Core/HW/DVD/AMMediaboard.cpp
index 7ff732e2fa..8533def250 100644
--- a/Source/Core/Core/HW/DVD/AMMediaboard.cpp
+++ b/Source/Core/Core/HW/DVD/AMMediaboard.cpp
@@ -773,7 +773,7 @@ static void AMMBCommandRecv(u32 parameter_offset, u32 network_buffer_base)
   int ret = recv(fd, reinterpret_cast<char*>(s_network_buffer + off), len, 0);
   const int err = WSAGetLastError();
 
-  NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: recv( {}, 0x{:08x}, {} ):{} {}", fd, off, len, ret, err);
+  DEBUG_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: recv( {}, 0x{:08x}, {} ):{} {}", fd, off, len, ret, err);
 
   s_media_buffer[1] = s_media_buffer[8];
   s_media_buffer_32[1] = ret;
@@ -802,8 +802,8 @@ static void AMMBCommandSend(u32 parameter_offset, u32 network_buffer_base)
   const int ret = send(fd, reinterpret_cast<char*>(s_network_buffer + off), len, SEND_FLAGS);
   const int err = WSAGetLastError();
 
-  NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: send( {}({}), 0x{:08x}, {} ): {} {}", fd,
-                 u32(guest_socket), off, len, ret, err);
+  DEBUG_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: send( {}({}), 0x{:08x}, {} ): {} {}", fd,
+                u32(guest_socket), off, len, ret, err);
 
   s_media_buffer[1] = s_media_buffer[8];
   s_media_buffer_32[1] = ret;
@@ -817,8 +817,7 @@ static void AMMBCommandSocket(u32 parameter_offset)
 
   const GuestSocket guest_socket = socket_(af, type, IPPROTO_TCP);
 
-  NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: socket( {}, {}, IPPROTO_TCP ):{}", af, type,
-                 u32(guest_socket));
+  NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: socket( {}, {} ):{}", af, type, u32(guest_socket));
 
   s_media_buffer[1] = 0;
   s_media_buffer_32[1] = u32(guest_socket);
@@ -863,9 +862,9 @@ static void AMMBCommandConnect(u32 parameter_offset, u32 network_buffer_base)
 
   const int ret = NetDIMMConnect(guest_socket, addr);
 
-  NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: connect( {}, ({},{},{}:{}), {} ):{}", u32(guest_socket),
-                 addr.struct_size, addr.ip_family, Common::IPAddressToString(addr.ip_address),
-                 ntohs(addr.port), len, ret);
+  INFO_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: connect( {}, ({},{},{}:{}), {} ):{}", u32(guest_socket),
+               addr.struct_size, addr.ip_family, Common::IPAddressToString(addr.ip_address),
+               ntohs(addr.port), len, ret);
 
   s_media_buffer[1] = s_media_buffer[8];
   s_media_buffer_32[1] = ret;
@@ -895,7 +894,7 @@ static void AMMBCommandAccept(u32 parameter_offset, u32 network_buffer_base)
     socklen_t addrlen = sizeof(addr);
     ret = u32(NetDIMMAccept(guest_socket, &addr, &addrlen));
 
-    NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: accept( {} ):{}", u32(guest_socket), int(ret));
+    INFO_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: accept( {} ):{}", u32(guest_socket), int(ret));
 
     auto* const addrlen_ptr =
         GetSafePtr(s_network_command_buffer, network_buffer_base, addrlen_off, sizeof(u32));
@@ -1005,9 +1004,9 @@ static void AMMBCommandSelect(u32 parameter_offset, u32 network_buffer_base)
     WARN_LOG_FMT(AMMEDIABOARD, "AMMBCommandSelect: Infinite timout!");
   }
 
-  NOTICE_LOG_FMT(
-      AMMEDIABOARD_NET, "GC-AM: select( {}, 0x{:08x} 0x{:08x} 0x{:08x} 0x{:08x} ) timeout={}", nfds,
-      readfds_offset, writefds_offset, exceptfds_offset, timeout_offset, timeout.count());
+  DEBUG_LOG_FMT(AMMEDIABOARD_NET,
+                "GC-AM: select( {}, 0x{:08x} 0x{:08x} 0x{:08x} 0x{:08x} ) timeout={}", nfds,
+                readfds_offset, writefds_offset, exceptfds_offset, timeout_offset, timeout.count());
 
   // Fill with the host sockets for each guest socket less-than `nfds` in each GuestFdSet.
   std::vector<WSAPOLLFD> pollfds(nfds, WSAPOLLFD{.fd = INVALID_SOCKET});
@@ -1022,7 +1021,7 @@ static void AMMBCommandSelect(u32 parameter_offset, u32 network_buffer_base)
   // TODO: There may be some edge cases where
   // poll's (POLLIN,POLLOUT,POLLPRI) don't map 1:1 with select's (readfds,writefds,exceptfds).
 
-  INFO_LOG_FMT(AMMEDIABOARD, "AMMBCommandSelect: Polling with socket count: {}", pollfds.size());
+  DEBUG_LOG_FMT(AMMEDIABOARD, "AMMBCommandSelect: Polling with socket count: {}", pollfds.size());
 
   const int ret = PlatformPoll(pollfds, timeout);
 
@@ -1033,7 +1032,7 @@ static void AMMBCommandSelect(u32 parameter_offset, u32 network_buffer_base)
     WriteGuestFdSetFromPollFds(guest_exceptfds_ptr, pollfds, POLLPRI);
   }
 
-  NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: select result: {}", ret);
+  DEBUG_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: select result: {}", ret);
 
   s_media_buffer[1] = 0;
   s_media_buffer_32[1] = ret;
@@ -1285,8 +1284,8 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
     {
       const AMMBCommand ammb_command = Common::BitCastPtr<AMMBCommand>(s_media_buffer + 0x202);
 
-      INFO_LOG_FMT(AMMEDIABOARD, "GC-AM: Execute command: (2){0:04X}",
-                   static_cast<u16>(ammb_command));
+      DEBUG_LOG_FMT(AMMEDIABOARD, "GC-AM: Execute command: (2){0:04X}",
+                    static_cast<u16>(ammb_command));
 
       memcpy(s_media_buffer, s_media_buffer + 0x200, 0x20);
       memset(s_media_buffer + 0x200, 0, 0x20);
@@ -1339,9 +1338,9 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
         // Triforce titles typically rely on hardcoded IP addresses.
         // Our config allows this to be overriden.
 
-        INFO_LOG_FMT(AMMEDIABOARD, "AMMBCommand::Bind: {}, {}, {}:{}", guest_addr.struct_size,
-                     guest_addr.ip_family, Common::IPAddressToString(guest_addr.ip_address),
-                     ntohs(guest_addr.port));
+        NOTICE_LOG_FMT(AMMEDIABOARD, "AMMBCommand::Bind: {}, {}, {}:{}", guest_addr.struct_size,
+                       guest_addr.ip_family, Common::IPAddressToString(guest_addr.ip_address),
+                       ntohs(guest_addr.port));
 
         // Apply "BindIP" if it's valid.
         const auto override_bind_ip = inet_addr(Config::Get(Config::MAIN_TRIFORCE_BIND_IP).c_str());
@@ -1380,9 +1379,9 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
                         err_msg);
         }
 
-        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: bind( {}, ({},{:08x}:{}), {} ):{} ({})",
-                       host_socket, addr.sin_family, addr.sin_addr.s_addr,
-                       Common::swap16(addr.sin_port), len, ret, err);
+        INFO_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: bind( {}, ({},{:08x}:{}), {} ):{} ({})", host_socket,
+                     addr.sin_family, addr.sin_addr.s_addr, Common::swap16(addr.sin_port), len, ret,
+                     err);
 
         s_media_buffer_32[1] = ret;
         s_last_error = SSC_SUCCESS;
@@ -1501,10 +1500,11 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
         break;
       case AMMBCommand::GetLastError:
       {
-        const auto fd = GetHostSocket(GuestSocket(s_media_buffer_32[2]));
+        const auto guest_socket = GuestSocket(s_media_buffer_32[2]);
+        const auto host_socket = GetHostSocket(guest_socket);
 
-        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: GetLastError( {}({}) ):{}", fd,
-                       s_media_buffer_32[2], s_last_error);
+        DEBUG_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: GetLastError( {}({}) ):{}", host_socket,
+                      int(guest_socket), int(s_last_error));
 
         // Good enough, assuming it's called for the same socket right after an error.
         // TODO: Implement something similar per socket.
@@ -1646,8 +1646,8 @@ u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u
       {
         const AMMBCommand ammb_command = Common::BitCastPtr<AMMBCommand>(s_media_buffer + 0x22);
 
-        INFO_LOG_FMT(AMMEDIABOARD, "GC-AM: Execute command: (1):{0:04X}",
-                     static_cast<u16>(ammb_command));
+        DEBUG_LOG_FMT(AMMEDIABOARD, "GC-AM: Execute command: (1):{0:04X}",
+                      static_cast<u16>(ammb_command));
 
         memset(s_media_buffer, 0, 0x20);