Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3a7005a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "dumpstate: Remove FWDUMP_bcmdhd support"

parents 7459281f 79109f8c

cmds/dumpstate/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -93,10 +93,6 @@ include $(BUILD_SHARED_LIBRARY) 
# ==========#

include $(CLEAR_VARS)



ifdef BOARD_WLAN_DEVICE

LOCAL_CFLAGS := -DFWDUMP_$(BOARD_WLAN_DEVICE)

endif



LOCAL_SRC_FILES := $(COMMON_SRC_FILES) \

        DumpstateService.cpp \

        dumpstate.cpp

cmds/dumpstate/dumpstate.cpp

+0 −15
Original line number Diff line number Diff line
@@ -1037,26 +1037,11 @@ static void dumpstate() { 
    RunCommand("WIFI NETWORKS", {"wpa_cli", "IFNAME=wlan0", "list_networks"},

               CommandOptions::WithTimeout(20).Build());



#ifdef FWDUMP_bcmdhd

    RunCommand("ND OFFLOAD TABLE", {WLUTIL, "nd_hostip"}, CommandOptions::AS_ROOT);



    RunCommand("DUMP WIFI INTERNAL COUNTERS (1)", {WLUTIL, "counters"}, AS_ROOT_20);



    RunCommand("ND OFFLOAD STATUS (1)", {WLUTIL, "nd_status"}, CommandOptions::AS_ROOT);



#endif

    DumpFile("INTERRUPTS (1)", "/proc/interrupts");



    RunDumpsys("NETWORK DIAGNOSTICS", {"connectivity", "--diag"},

               CommandOptions::WithTimeout(10).Build());



#ifdef FWDUMP_bcmdhd

    RunCommand("DUMP WIFI STATUS", {"dhdutil", "-i", "wlan0", "dump"}, AS_ROOT_20);



    RunCommand("DUMP WIFI INTERNAL COUNTERS (2)", {WLUTIL, "counters"}, AS_ROOT_20);



    RunCommand("ND OFFLOAD STATUS (2)", {WLUTIL, "nd_status"}, CommandOptions::AS_ROOT);

#endif

    DumpFile("INTERRUPTS (2)", "/proc/interrupts");



    RunCommand("SYSTEM PROPERTIES", {"getprop"});