clean up debug spew for merge to main

This commit is contained in:
bunnie 2022-08-05 15:50:11 +08:00
parent cc03383891
commit bd8afc6de7
4 changed files with 9 additions and 9 deletions

View file

@ -145,7 +145,7 @@ impl <'a> NetPhyTxToken<'a> {
repr.emit(&mut packet); repr.emit(&mut packet);
} }
let pkt = frame.into_inner().to_vec(); let pkt = frame.into_inner().to_vec();
log::info!("stuffing arp {:?}", pkt); log::debug!("stuffing arp {:?}", pkt);
self.com.wlan_queue_loopback(&pkt); self.com.wlan_queue_loopback(&pkt);
self.loopback_rx(pkt.len()); self.loopback_rx(pkt.len());
} }
@ -168,12 +168,12 @@ impl<'a> phy::TxToken for NetPhyTxToken<'a> {
local_hwaddr[2..6].copy_from_slice(&MAC_ADDRESS_LSB.load(Ordering::SeqCst).to_be_bytes()); local_hwaddr[2..6].copy_from_slice(&MAC_ADDRESS_LSB.load(Ordering::SeqCst).to_be_bytes());
local_hwaddr[0..2].copy_from_slice(&MAC_ADDRESS_MSB.load(Ordering::SeqCst).to_be_bytes()); local_hwaddr[0..2].copy_from_slice(&MAC_ADDRESS_MSB.load(Ordering::SeqCst).to_be_bytes());
if frame.dst_addr() == EthernetAddress::default() { if frame.dst_addr() == EthernetAddress::default() {
log::info!("loopback packet redirect"); log::debug!("loopback packet redirect");
// override the destination address to be our own address // override the destination address to be our own address
frame.set_dst_addr(smoltcp::wire::EthernetAddress(local_hwaddr)); frame.set_dst_addr(smoltcp::wire::EthernetAddress(local_hwaddr));
loopback = true; loopback = true;
} else if frame.dst_addr().as_bytes() == local_hwaddr { } else if frame.dst_addr().as_bytes() == local_hwaddr {
log::info!("loopback return packet redirect"); log::debug!("loopback return packet redirect");
loopback = true; loopback = true;
} }
} }

View file

@ -193,7 +193,7 @@ fn setup_icmp(iface: &mut Interface::<NetPhy>) -> SocketHandle {
fn main() -> ! { fn main() -> ! {
log_server::init_wait().unwrap(); log_server::init_wait().unwrap();
log::set_max_level(log::LevelFilter::Debug); log::set_max_level(log::LevelFilter::Info);
log::info!("my PID is {}", xous::process::id()); log::info!("my PID is {}", xous::process::id());
let xns = xous_names::XousNames::new().unwrap(); let xns = xous_names::XousNames::new().unwrap();
@ -1020,7 +1020,7 @@ fn main() -> ! {
let socket = iface.get_socket::<TcpSocket>(*connection); let socket = iface.get_socket::<TcpSocket>(*connection);
let args = msg.body.scalar_message().unwrap(); let args = msg.body.scalar_message().unwrap();
let no_delay = args.arg1 != 0; let no_delay = args.arg1 != 0;
log::info!("setting nagle to {}", !no_delay); log::warn!("Setting nagle to {}, see issue #210 about readback!", !no_delay);
socket.set_nagle_enabled(!no_delay); socket.set_nagle_enabled(!no_delay);
xous::return_scalar(msg.sender, 0).ok(); xous::return_scalar(msg.sender, 0).ok();
} else { } else {
@ -1705,7 +1705,7 @@ fn main() -> ! {
tcp_server_remote_close_poll.retain(|x| { tcp_server_remote_close_poll.retain(|x| {
*x != *handle *x != *handle
}); });
log::info!("would return_scalar now"); // log::info!("would return_scalar now");
xous::return_scalar(*sender, 0).ok(); xous::return_scalar(*sender, 0).ok();
false false
} else { } else {

View file

@ -71,7 +71,7 @@ pub(crate) fn std_tcp_connect(
tcp_connect_waiting, tcp_connect_waiting,
(msg, handle, idx, local_port, remote_port), (msg, handle, idx, local_port, remote_port),
); );
log::info!("connect waiting now: {}, {:?} {:?} {:?}", idx, handle, local_port, remote_port); log::debug!("connect waiting now: {}, {:?} {:?} {:?}", idx, handle, local_port, remote_port);
} }
pub(crate) fn std_tcp_tx( pub(crate) fn std_tcp_tx(

View file

@ -1,4 +1,4 @@
use crate::{ShellCmdApi, CommonEnv, nettests}; use crate::{ShellCmdApi, CommonEnv};
use com::api::NET_MTU; use com::api::NET_MTU;
use xous_ipc::String; use xous_ipc::String;
#[cfg(any(target_os = "none", target_os = "xous"))] #[cfg(any(target_os = "none", target_os = "xous"))]
@ -289,7 +289,7 @@ impl<'a> ShellCmdApi<'a> for NetCmd {
} }
#[cfg(feature="nettest")] #[cfg(feature="nettest")]
"test" => { "test" => {
nettests::start_batch_tests(); crate::nettests::start_batch_tests();
write!(ret, "Net batch tests started...").ok(); write!(ret, "Net batch tests started...").ok();
} }
#[cfg(feature="ditherpunk")] #[cfg(feature="ditherpunk")]