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

Commit b09149f6 authored by Dmitry Shmidt's avatar Dmitry Shmidt Committed by android-build-merger
Browse files

Merge "dumpstate: Remove FWDUMP_bcmdhd support" am: 86388dbc 

am: 2d71f97d

Change-Id: I1e3a7ae0e7855a8003f463586d368a81ad89be5f
parents cd1d8c6b 2d71f97d

cmds/dumpstate/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ LOCAL_PATH:= $(call my-dir) 


include $(CLEAR_VARS)



ifdef BOARD_WLAN_DEVICE

LOCAL_CFLAGS := -DFWDUMP_$(BOARD_WLAN_DEVICE)

endif



LOCAL_SRC_FILES := dumpstate.cpp utils.cpp



LOCAL_MODULE := dumpstate

cmds/dumpstate/dumpstate.cpp

+0 −21
Original line number Diff line number Diff line
@@ -1009,31 +1009,10 @@ static void dumpstate(const std::string& screenshot_path, const std::string& ver 
    run_command("MULTICAST ADDRESSES", 10, "ip", "maddr", NULL);

    run_command("WIFI NETWORKS", 20, "wpa_cli", "IFNAME=wlan0", "list_networks", NULL);



#ifdef FWDUMP_bcmdhd

    run_command("ND OFFLOAD TABLE", 5,

            SU_PATH, "root", WLUTIL, "nd_hostip", NULL);



    run_command("DUMP WIFI INTERNAL COUNTERS (1)", 20,

            SU_PATH, "root", WLUTIL, "counters", NULL);



    run_command("ND OFFLOAD STATUS (1)", 5,

            SU_PATH, "root", WLUTIL, "nd_status", NULL);



#endif

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



    run_command("NETWORK DIAGNOSTICS", 10, "dumpsys", "-t", "10", "connectivity", "--diag", NULL);



#ifdef FWDUMP_bcmdhd

    run_command("DUMP WIFI STATUS", 20,

            SU_PATH, "root", "dhdutil", "-i", "wlan0", "dump", NULL);



    run_command("DUMP WIFI INTERNAL COUNTERS (2)", 20,

            SU_PATH, "root", WLUTIL, "counters", NULL);



    run_command("ND OFFLOAD STATUS (2)", 5,

            SU_PATH, "root", WLUTIL, "nd_status", NULL);

#endif

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



    run_command("SYSTEM PROPERTIES", 5, "getprop", NULL);