Merge pull request #934 from david-cermak/bump/modem_1.4.2

[modem]: Release `v1.4.2`

.github/workflows/asio__build-target-test.yml

@@ -81,24 +81,18 @@ jobs:
         with:
           name: examples_app_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.example }}
           path: ${{ env.TEST_DIR }}/${{ matrix.example }}/build
+      - name: Install Python packages
+        env:
+          PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple"
+        run: |
+            sudo apt-get install -y dnsutils
+      - name: Download Example Test to target ${{ matrix.config }}
+        run: |
+            python -m esptool --chip ${{ matrix.idf_target }} write_flash 0x0 ${{ env.TEST_DIR }}/${{ matrix.example }}/build/flash_image.bin
       - name: Run Example Test ${{ matrix.example }} on target
         working-directory: ${{ env.TEST_DIR }}/${{ matrix.example }}
         run: |
-          export PYENV_ROOT="$HOME/.pyenv"
-          export PATH="$PYENV_ROOT/bin:$PATH"
-          eval "$(pyenv init --path)"
-          eval "$(pyenv init -)"
-          if ! pyenv versions --bare | grep -q '^3\.12\.6$'; then
-            echo "Installing Python 3.12.6..."
-            pyenv install -s 3.12.6
-          fi
-          if ! pyenv virtualenvs --bare | grep -q '^myenv$'; then
-            echo "Creating pyenv virtualenv 'myenv'..."
-            pyenv virtualenv 3.12.6 myenv
-          fi
-          pyenv activate myenv
-          python --version
-          python -m pytest --log-cli-level DEBUG --junit-xml=./examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }}.xml --target=${{ matrix.idf_target }}
+            python -m pytest --log-cli-level DEBUG --junit-xml=./examples_results_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.config }}.xml --target=${{ matrix.idf_target }}
       - uses: actions/upload-artifact@v4
         if: always()
         with:

.github/workflows/clang-tidy.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          submodules: recursive
+          submodules: 'true'
       - name: Install esp-clang
         run: |
           ${IDF_PATH}/tools/idf_tools.py --non-interactive install esp-clang

.github/workflows/console_cmd_ifconfig__build.yml

@@ -13,7 +13,7 @@ jobs:
     name: Build
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5", "release-v6.0"]
+        idf_ver: ["latest", "release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3"]
         idf_target: ["esp32"]
         test: [ { app: ifconfig-basic, path: "components/console_cmd_ifconfig/examples"}]
         include:

.github/workflows/console_cmd_mqtt__build.yml

@@ -13,7 +13,7 @@ jobs:
     name: Build
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5", "release-v6.0"]
+        idf_ver: ["latest", "release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3"]
         idf_target: ["esp32"]
         test: [ { app: mqtt_ssl_auth_console, path: "components/console_cmd_mqtt/examples" }]
     runs-on: ubuntu-22.04

.github/workflows/console_cmd_ping__build.yml

@@ -13,7 +13,7 @@ jobs:
     name: Build
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5", "release-v6.0"]
+        idf_ver: ["latest", "release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3"]
         idf_target: ["esp32"]
         test: [ { app: ping-basic, path: "components/console_cmd_ping/examples" }]
     runs-on: ubuntu-22.04

.github/workflows/console_cmd_wifi__build.yml

@@ -13,7 +13,7 @@ jobs:
     name: Build
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5", "release-v6.0"]
+        idf_ver: ["latest", "release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3"]
         idf_target: ["esp32"]
         test: [ { app: wifi-basic, path: "components/console_cmd_wifi/examples" }]
     runs-on: ubuntu-22.04

.github/workflows/console_simple_init__build.yml

@@ -13,7 +13,7 @@ jobs:
     name: Build
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5", "release-v6.0"]
+        idf_ver: ["latest", "release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3"]
         idf_target: ["esp32"]
         test: [ { app: console_basic, path: "components/console_simple_init/examples" }]
     runs-on: ubuntu-22.04

.github/workflows/eppp__build.yml

@@ -13,7 +13,7 @@ jobs:
     name: Build
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v6.0", "release-v5.5", "release-v5.4", "release-v5.3"]
+        idf_ver: ["latest", "release-v5.3"]
         test: [ { app: host, path: "examples/host" }, { app: slave, path: "examples/slave" }, { app: test_app, path: "test/test_app" }]
     runs-on: ubuntu-22.04
     container: espressif/idf:${{ matrix.idf_ver }}
@@ -21,8 +21,6 @@ jobs:
       - name: Checkout esp-protocols
         uses: actions/checkout@v3
       - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }}
-        env:
-          EXPECTED_WARNING: "DeprecationWarning: 'MultiCommand' is deprecated and will be removed\nCryptographyDeprecationWarning: Parsed a serial number which wasn't positive"
         shell: bash
         run: |
           . ${IDF_PATH}/export.sh

.github/workflows/esp_dns__build.yml

@@ -1,41 +0,0 @@
-name: "esp_dns: build-tests"
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-
-jobs:
-  build_esp_dns:
-    if: contains(github.event.pull_request.labels.*.name, 'dns') || github.event_name == 'push'
-    name: Build
-    strategy:
-      matrix:
-        idf_ver: ["latest", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4"]
-        idf_target: ["esp32"]
-        test: [ { app: esp_dns_basic, path: "components/esp_dns/examples"}]
-        include:
-          - idf_ver: "latest"
-            warning: "the choice symbol ETHERNET_PHY_LAN867X\nis deprecated: Please use smi_gpio instead"
-
-    runs-on: ubuntu-22.04
-    container: espressif/idf:${{ matrix.idf_ver }}
-    steps:
-      - name: Checkout esp-protocols
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
-        env:
-          EXPECTED_WARNING: ${{ matrix.warning }}
-        shell: bash
-        working-directory: ${{matrix.test.path}}
-        run: |
-          if [[ "${{ matrix.idf_ver }}" == "release-v5.3" || "${{ matrix.idf_ver }}" == "release-v5.4" ]]; then
-            export EXPECTED_WARNING="unknown kconfig symbol 'LWIP_USE_ESP_GETADDRINFO'"
-          fi
-          . ${IDF_PATH}/export.sh
-          pip install idf-component-manager idf-build-apps --upgrade
-          python ../../../ci/build_apps.py ./${{ matrix.test.app }} --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app

.github/workflows/examples_build-host-test.yml

@@ -13,7 +13,10 @@ jobs:
     name: Build examples
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5", "release-v6.0"]
+        idf_ver: ["latest", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4"]
+        include:
+          - idf_ver: "latest"
+            warning: "Warning: The smallest app partition is nearly full"
     runs-on: ubuntu-22.04
     container: espressif/idf:${{ matrix.idf_ver }}
     env:
@@ -24,7 +27,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Build with IDF-${{ matrix.idf_ver }}
         env:
-          EXPECTED_WARNING: "Warning: The smallest app partition is nearly full"
+          EXPECTED_WARNING: ${{ matrix.warning }}
         shell: bash
         run: |
           . ${IDF_PATH}/export.sh
@@ -56,11 +59,10 @@ jobs:
       - name: Build with IDF-${{ matrix.idf_ver }}
         shell: bash
         run: |
-          . ${GITHUB_WORKSPACE}/ci/config_env.sh
           . ${IDF_PATH}/export.sh
           python -m pip install idf-build-apps
-          python ./ci/build_apps.py examples/mqtt -l -t linux -r 'sdkconfig.ci'
-          timeout 5 ./examples/mqtt/build_linux/esp_mqtt_demo.elf | tee test.log  || true
+          python ./ci/build_apps.py examples/mqtt -l -t linux
+          timeout 5 ./examples/mqtt/build_linux_default/esp_mqtt_demo.elf | tee test.log  || true
           grep 'MQTT_EVENT_DATA' test.log
 
   run_on_target:
@@ -72,7 +74,7 @@ jobs:
     needs: build_all_examples
     strategy:
       matrix:
-        idf_ver: ["release-v5.5", "latest"]
+        idf_ver: ["release-v5.4", "latest"]
     runs-on:
       - self-hosted
       - modem

.github/workflows/lws_build.yml

@@ -13,7 +13,7 @@ jobs:
     name: Libwebsockets build
     strategy:
       matrix:
-        idf_ver: ["release-v5.3", "release-v5.4", "release-v5.5"]
+        idf_ver: ["latest", "release-v5.3", "release-v5.4"]
         test: [ { app: example, path: "examples/client" }]
     runs-on: ubuntu-22.04
     container: espressif/idf:${{ matrix.idf_ver }}
@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        idf_ver: ["release-v5.3", "release-v5.4", "release-v5.5"]
+        idf_ver: ["latest", "release-v5.3", "release-v5.4"]
         idf_target: ["esp32"]
         test: [ { app: example, path: "examples/client" }]
     runs-on:
@@ -65,24 +65,14 @@ jobs:
         with:
           name: lws_target_esp32_${{ matrix.idf_ver }}_${{ matrix.test.app }}
           path: ${{ env.TEST_DIR }}/ci/
+      - name: Install Python packages
+        env:
+          PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple"
+        run: |
+          pip install --only-binary cryptography --extra-index-url https://dl.espressif.com/pypi/ -r $GITHUB_WORKSPACE/ci/requirements.txt
       - name: Run Example Test on target
         working-directory: ${{ env.TEST_DIR }}
         run: |
-          export PYENV_ROOT="$HOME/.pyenv"
-          export PATH="$PYENV_ROOT/bin:$PATH"
-          eval "$(pyenv init --path)"
-          eval "$(pyenv init -)"
-          if ! pyenv versions --bare | grep -q '^3\.12\.6$'; then
-            echo "Installing Python 3.12.6..."
-            pyenv install -s 3.12.6
-          fi
-          if ! pyenv virtualenvs --bare | grep -q '^myenv$'; then
-            echo "Creating pyenv virtualenv 'myenv'..."
-            pyenv virtualenv 3.12.6 myenv
-          fi
-          pyenv activate myenv
-          python --version
-          pip install --only-binary cryptography --extra-index-url https://dl.espressif.com/pypi/ -r $GITHUB_WORKSPACE/ci/requirements.txt
           unzip ci/artifacts.zip -d ci
           for dir in `ls -d ci/build_*`; do
           rm -rf build sdkconfig.defaults

.github/workflows/mdns__build-target-test.yml

@@ -24,11 +24,6 @@ jobs:
         shell: bash
         run: |
           . ${IDF_PATH}/export.sh
-          if [[ "${{ matrix.idf_ver }}" == "latest" ]]; then
-            export EXPECTED_WARNING="warning: unknown kconfig symbol 'EXAMPLE_ETH_PHY_IP101'"
-          else
-            export EXPECTED_WARNING="warning: unknown kconfig symbol 'EXAMPLE_ETH_PHY_GENERIC'"
-          fi
           python -m pip install idf-build-apps
           # Build default configs for all targets
           python ./ci/build_apps.py components/mdns/${{ matrix.test.path }} -r default -d
@@ -76,22 +71,6 @@ jobs:
       - name: Run ${{ matrix.test.app }} application on ${{ matrix.idf_target }}
         working-directory: components/mdns/${{ matrix.test.path }}
         run: |
-            export PYENV_ROOT="$HOME/.pyenv"
-            export PATH="$PYENV_ROOT/bin:$PATH"
-            eval "$(pyenv init --path)"
-            eval "$(pyenv init -)"
-            if ! pyenv versions --bare | grep -q '^3\.12\.6$'; then
-              echo "Installing Python 3.12.6..."
-              pyenv install -s 3.12.6
-            fi
-            if ! pyenv virtualenvs --bare | grep -q '^myenv$'; then
-              echo "Creating pyenv virtualenv 'myenv'..."
-              pyenv virtualenv 3.12.6 myenv
-            fi
-            pyenv activate myenv
-            python --version
-            pip install --prefer-binary cryptography pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf pytest-custom_exit_code esptool
-            pip install --extra-index-url https://dl.espressif.com/pypi/ -r $GITHUB_WORKSPACE/ci/requirements.txt
             unzip ci/artifacts.zip -d ci
             for dir in `ls -d ci/build_*`; do
             rm -rf build sdkconfig.defaults

.github/workflows/mdns__host-tests.yml

@@ -24,13 +24,11 @@ jobs:
         shell: bash
         run: |
           . ${IDF_PATH}/export.sh
-          python -m pip install idf-build-apps==2.10.0 dnspython pytest pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf
+          python -m pip install idf-build-apps dnspython pytest pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf
           cd $GITHUB_WORKSPACE/protocols
           # Build host tests app (with all configs and targets supported)
           python ./ci/build_apps.py components/mdns/tests/host_test/
           cd components/mdns/tests/host_test
-          ls -la
-          ls -ls build*
           # First run the linux_app and send a quick A query and a reverse query
           ./build_linux_app/mdns_host.elf &
           python dnsfixture.py A myesp.local --ip_only | xargs python dnsfixture.py X
@@ -57,11 +55,8 @@ jobs:
         shell: bash
         run: |
           . ${IDF_PATH}/export.sh
-          cd components/mdns/tests/host_unit_test/
-          idf.py reconfigure
-          mkdir build2 && cd build2
-          cmake ..
-          cmake --build .
+          cd components/mdns/tests/test_afl_fuzz_host/
+          make INSTR=off
       - name: Test no malloc functions
         shell: bash
         run: |
@@ -73,89 +68,3 @@ jobs:
             diff -q $file /tmp/$file || exit 1
             echo "OK"
           done
-
-  host_unit_test:
-    if: contains(github.event.pull_request.labels.*.name, 'mdns') || github.event_name == 'push'
-    name: Unit tests on host
-    strategy:
-      matrix:
-        idf_ver: ["latest"]
-
-    runs-on: ubuntu-22.04
-    container: espressif/idf:${{ matrix.idf_ver }}
-    steps:
-      - name: Checkout esp-protocols
-        uses: actions/checkout@v4
-      - name: Install bsdlib and ruby
-        run: |
-          apt-get update -y
-          apt-get install -y libbsd-dev ruby
-      - name: Build and run unit tests
-        shell: bash
-        run: |
-          . ${IDF_PATH}/export.sh
-          cd components/mdns/tests/host_unit_test/
-          idf.py reconfigure
-          mkdir build2 && cd build2
-          cmake -DUNIT_TESTS=test_receiver ..
-          cmake --build .
-          ctest --extra-verbose
-          cd ..
-          mkdir build3 && cd build3
-          cmake -DUNIT_TESTS=test_sender ..
-          cmake --build .
-          ctest --extra-verbose
-
-
-  fuzz_test:
-    if: contains(github.event.pull_request.labels.*.name, 'mdns-fuzz') || github.event_name == 'push'
-    name: Fuzzer tests for mdns lib
-    strategy:
-      matrix:
-        idf_ver: ["latest"]
-
-    runs-on: ubuntu-22.04
-    container: aflplusplus/aflplusplus:v4.34c
-    steps:
-      - name: Checkout esp-protocols
-        uses: actions/checkout@v4
-
-      - name: Checkout ESP-IDF
-        uses: actions/checkout@v4
-        with:
-          repository: espressif/esp-idf
-          path: idf
-          submodules: recursive
-
-      - name: Install Necessary Libs
-        run: |
-          apt-get update -y
-          apt-get install -y libbsd-dev
-
-      - name: Run AFL++
-        shell: bash
-        run: |
-          export IDF_PATH=$GITHUB_WORKSPACE/idf
-          cd components/mdns/tests/host_unit_test/
-          pip install dnslib
-          cd input && python generate_cases.py && cd ..
-          cmake -B build2 -S . -G "Ninja" -DCMAKE_C_COMPILER=afl-cc
-          cmake --build build2
-          timeout 10m afl-fuzz -i input -o out -- build2/mdns_host_unit_test || \
-          if [ $? -eq 124 ]; then  # timeout exit code
-            if [ -n "$(find out/default/crashes -type f 2>/dev/null)" ]; then
-              echo "Crashes found!";
-              tar -czf out/default/crashes.tar.gz -C out/default crashes;
-              exit 1;
-            fi
-          else
-            exit 1;
-          fi
-
-      - name: Upload Crash Artifacts
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: fuzz-crashes
-          path: components/mdns/tests/host_unit_test/out/default/crashes.tar.gz
-          if-no-files-found: ignore

.github/workflows/modem__build-host-tests.yml

@@ -13,7 +13,7 @@ jobs:
     name: Build examples
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5", "release-v6.0"]
+        idf_ver: ["latest", "release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4"]
         example: ["pppos_client", "modem_console", "modem_tcp_client", "ap_to_pppos", "simple_cmux_client"]
     runs-on: ubuntu-22.04
     container: espressif/idf:${{ matrix.idf_ver }}
@@ -39,8 +39,8 @@ jobs:
     name: Build tests
     strategy:
       matrix:
-        idf_ver: ["latest","release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5", "release-v6.0"]
-        test: ["target", "target_ota", "target_iperf", "target_urc"]
+        idf_ver: ["release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "latest"]
+        test: ["target", "target_ota", "target_iperf"]
 
     runs-on: ubuntu-22.04
     container: espressif/idf:${{ matrix.idf_ver }}
@@ -86,21 +86,3 @@ jobs:
         run_executable: false
         run_coverage: false
         pre_run_script: "esp-protocols/components/esp_modem/test/host_test/env.sh"
-
-  esp_modem_generated_commands:
-    if: contains(github.event.pull_request.labels.*.name, 'modem') || github.event_name == 'push'
-    name: Generated commands compatibility
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout esp-protocols
-        uses: actions/checkout@v4
-      - name: Compat check
-        shell: bash
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y astyle
-          cd components/esp_modem
-          find examples/ -type f -regex '.*/generate/.*\.\(hpp\|cpp\)' -exec ./scripts/generate.sh {} \;
-          ./scripts/generate.sh
-          git diff --name-only
-          git diff --quiet

.github/workflows/modem__target-test.yml

@@ -13,7 +13,7 @@ jobs:
     name: Build Target tests
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.5", "release-v6.0"]
+        idf_ver: ["latest"]
         idf_target: ["esp32c3"]
         test: [ { app: pppd, path: test/target }, { app: pppd_chap_auth, path: test/target }, { app: sim800_c3, path: examples/pppos_client }, { app: sim800_cmux, path: examples/simple_cmux_client } ]
         include:
@@ -34,16 +34,18 @@ jobs:
           IDF_TARGET: ${{ matrix.idf_target }}
           SDKCONFIG: sdkconfig.ci.${{ matrix.test.app }}
         shell: bash
+        working-directory: ${{ env.TEST_DIR }}
         run: |
-          . ${GITHUB_WORKSPACE}/ci/config_env.sh
           . ${IDF_PATH}/export.sh
-          python -m pip install idf-build-apps
-          python ./ci/build_apps.py ${{ env.TEST_DIR }} -t ${{ matrix.idf_target }} -r 'sdkconfig.ci.${{ matrix.test.app }}'
-          $GITHUB_WORKSPACE/ci/clean_build_artifacts.sh ${GITHUB_WORKSPACE}/${TEST_DIR}/build_${{ matrix.idf_target }}
+          rm -rf sdkconfig build
+          [ -f ${SDKCONFIG} ] && cp ${SDKCONFIG} sdkconfig.defaults
+          idf.py set-target ${{ matrix.idf_target }}
+          idf.py build
+          $GITHUB_WORKSPACE/ci/clean_build_artifacts.sh ${GITHUB_WORKSPACE}/${TEST_DIR}/build
       - uses: actions/upload-artifact@v4
         with:
           name: modem_target_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.test.app }}
-          path: ${{ env.TEST_DIR }}/build_${{ matrix.idf_target }}
+          path: ${{ env.TEST_DIR }}/build
           if-no-files-found: error
 
   target_tests_esp_modem:
@@ -54,7 +56,7 @@ jobs:
     name: Run Target tests
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v5.5", "release-v6.0"]
+        idf_ver: ["latest"]
         idf_target: ["esp32c3"]
         test: [ { app: pppd, path: test/target }, { app: pppd_chap_auth, path: test/target }, { app: sim800_c3, path: examples/pppos_client }, { app: sim800_cmux, path: examples/simple_cmux_client } ]
         include:

.github/workflows/modem_sim__build.yml

@@ -1,32 +0,0 @@
-name: "modem_sim: build-tests"
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    types: [opened, synchronize, reopened, labeled]
-
-jobs:
-  build_modem_sim:
-    if: contains(github.event.pull_request.labels.*.name, 'modem_sim') || github.event_name == 'push'
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout esp-protocols
-        uses: actions/checkout@v3
-      - name: Checkout idf
-        uses: actions/checkout@v3
-        with:
-          repository: espressif/esp-idf
-          ref: 8ad0d3d8f2faab752635bee36070313c47c07a13
-          path: idf
-      - name: Build ESP-AT with IDF-${{ matrix.idf_ver }}
-        shell: bash
-        run: |
-          export IDF_PATH=$GITHUB_WORKSPACE/idf
-          ${IDF_PATH}/install.sh
-          cd common_components/modem_sim
-          ./install.sh
-          source export.sh
-          idf.py build

.github/workflows/mosq__build.yml

@@ -13,21 +13,11 @@ jobs:
     name: Mosquitto build
     strategy:
       matrix:
-        idf_ver: ["latest", "release-v6.0", "release-v5.5", "release-v5.4", "release-v5.3", "release-v5.2", "release-v5.1"]
-        example: ["broker"]
-        include:
-          # serverless_mqtt is not supported on >=v6.0 (esp-peer dependency)
-          - idf_ver: "release-v5.3"
-            example: "serverless_mqtt"
-          - idf_ver: "release-v5.4"
-            example: "serverless_mqtt"
-          - idf_ver: "release-v5.5"
-            example: "serverless_mqtt"
-
+        idf_ver: ["latest", "release-v5.3"]
     runs-on: ubuntu-22.04
     container: espressif/idf:${{ matrix.idf_ver }}
     env:
-      TEST_DIR: components/mosquitto/examples/${{ matrix.example }}
+      TEST_DIR: components/mosquitto/examples
       TARGET_TEST: broker
       TARGET_TEST_DIR: build_esp32_default
     steps:
@@ -41,17 +31,14 @@ jobs:
           . ${IDF_PATH}/export.sh
           pip install idf-component-manager idf-build-apps --upgrade
           python ci/build_apps.py -c ${TEST_DIR} -m components/mosquitto/.build-test-rules.yml
-          if [ "${{ matrix.example }}" == "${TARGET_TEST}" ]; then
-            # upload only the target test artifacts
-            cd ${TEST_DIR}
-            ${GITHUB_WORKSPACE}/ci/clean_build_artifacts.sh `pwd`/${TARGET_TEST_DIR}
-            zip -qur artifacts.zip ${TARGET_TEST_DIR}
-          fi
+          # upload only the target test artifacts
+          cd ${TEST_DIR}/${TARGET_TEST}
+          ${GITHUB_WORKSPACE}/ci/clean_build_artifacts.sh `pwd`/${TARGET_TEST_DIR}
+          zip -qur artifacts.zip ${TARGET_TEST_DIR}
       - uses: actions/upload-artifact@v4
-        if: ${{ matrix.example == 'broker' }}
         with:
           name: mosq_target_esp32_${{ matrix.idf_ver }}
-          path: ${{ env.TEST_DIR }}/artifacts.zip
+          path: ${{ env.TEST_DIR }}/${{ env.TARGET_TEST }}/artifacts.zip
           if-no-files-found: error
 
   test_mosq:
@@ -63,7 +50,7 @@ jobs:
     needs: build_mosq
     strategy:
       matrix:
-        idf_ver: ["release-v5.4", "release-v5.5", "release-v6.0", "latest"]
+        idf_ver: ["latest", "release-v5.3"]
     runs-on:
       - self-hosted
       - ESP32-ETHERNET-KIT
@@ -79,20 +66,6 @@ jobs:
       - name: Run Test
         working-directory: ${{ env.TEST_DIR }}
         run: |
-          export PYENV_ROOT="$HOME/.pyenv"
-          export PATH="$PYENV_ROOT/bin:$PATH"
-          eval "$(pyenv init --path)"
-          eval "$(pyenv init -)"
-          if ! pyenv versions --bare | grep -q '^3\.12\.6$'; then
-            echo "Installing Python 3.12.6..."
-            pyenv install -s 3.12.6
-          fi
-          if ! pyenv virtualenvs --bare | grep -q '^myenv$'; then
-            echo "Creating pyenv virtualenv 'myenv'..."
-            pyenv virtualenv 3.12.6 myenv
-          fi
-          pyenv activate myenv
-          python --version
           python -m pip install pytest-embedded-serial-esp pytest-embedded-idf pytest-rerunfailures pytest-timeout pytest-ignore-test-results
           unzip ci/artifacts.zip -d ci
           for dir in `ls -d ci/build_*`; do
@@ -136,7 +109,7 @@ jobs:
     name: Build IDF tests
     strategy:
       matrix:
-        idf_ver: ["release-v5.5"]   # TODO: add release-v6.0/latest with esp-mqtt directly
+        idf_ver: ["latest"]
         idf_target: ["esp32"]
         test: [ { app: publish, path: "tools/test_apps/protocols/mqtt/publish_connect_test" }]
     runs-on: ubuntu-22.04
@@ -181,7 +154,7 @@ jobs:
     needs: build_idf_tests_with_mosq
     strategy:
       matrix:
-        idf_ver: ["release-v5.5"]
+        idf_ver: ["latest"]
     runs-on:
       - self-hosted
       - ESP32-ETHERNET-KIT
@@ -196,20 +169,6 @@ jobs:
       - name: Run Test
         working-directory: ${{ env.TEST_DIR }}
         run: |
-          export PYENV_ROOT="$HOME/.pyenv"
-          export PATH="$PYENV_ROOT/bin:$PATH"
-          eval "$(pyenv init --path)"
-          eval "$(pyenv init -)"
-          if ! pyenv versions --bare | grep -q '^3\.12\.6$'; then
-            echo "Installing Python 3.12.6..."
-            pyenv install -s 3.12.6
-          fi
-          if ! pyenv virtualenvs --bare | grep -q '^myenv$'; then
-            echo "Creating pyenv virtualenv 'myenv'..."
-            pyenv virtualenv 3.12.6 myenv
-          fi
-          pyenv activate myenv
-          python --version
           python -m pip install pytest-embedded-serial-esp pytest-embedded-idf pytest-rerunfailures pytest-timeout pytest-ignore-test-results "paho-mqtt<2"  --upgrade
           unzip ci/artifacts.zip -d ci
           for dir in `ls -d ci/build_*`; do

.github/workflows/mqtt_cxx__build.yml

@@ -13,9 +13,9 @@ jobs:
     name: Build
     strategy:
       matrix:
-        idf_ver: ["release-v5.1", "release-v5.2", "release-v5.3", "release-v5.4", "release-v5.5"]
+        idf_ver: ["latest", "release-v5.0", "release-v5.1", "release-v5.2", "release-v5.3"]
         idf_target: ["esp32"]
-        test: [ { app: mqtt-basic, path: "components/esp_mqtt_cxx/examples" }, { app: test, path: "components/esp_mqtt_cxx/test/unit" }]
+        test: [ { app: mqtt-basic, path: "components/esp_mqtt_cxx/examples" }]
     runs-on: ubuntu-22.04
     container: espressif/idf:${{ matrix.idf_ver }}
     steps:
@@ -25,7 +25,8 @@ jobs:
           submodules: recursive
       - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
         shell: bash
+        working-directory: ${{matrix.test.path}}
         run: |
           . ${IDF_PATH}/export.sh
           pip install idf-component-manager idf-build-apps --upgrade
-          python ./ci/build_apps.py ./${{ matrix.test.path }} --target ${{ matrix.idf_target }} -vv --preserve-all -c
+          python ../../../ci/build_apps.py ./${{ matrix.test.app }} --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app

.github/workflows/pre_commit_check.yml

@@ -1,45 +0,0 @@
-name: Check pre-commit rules
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-permissions:
-  contents: read
-
-jobs:
-  pre_commit_check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.base_ref }}
-          fetch-depth: 20
-      - name: Fetch head and base refs
-        # This is necessary for pre-commit to check the changes in the PR branch (and to set origin/HEAD and HEAD refs)
-        run: |
-          git fetch origin ${{ github.event.pull_request.head.sha }}:pr_ref
-          git checkout pr_ref
-          git remote set-head origin --auto
-          git merge-base origin/HEAD HEAD || ( echo "Your PR is far behind origin/HEAD, please rebase" && exit 1 )
-      - name: Set up Python environment
-        uses: actions/setup-python@master
-        with:
-          python-version: v3.8
-      - name: Install python packages
-        run: |
-          pip install pre-commit
-          pre-commit install-hooks
-      - name: Run pre-commit and check for any changes
-        run: |
-          echo "Commits being checked:"
-          git log --oneline --no-decorate origin/HEAD..HEAD
-          echo ""
-          if ! pre-commit run --from-ref origin/HEAD --to-ref HEAD --hook-stage manual --show-diff-on-failure ; then
-            echo ""
-            echo "::notice::It looks like the commits in this PR have been made without having pre-commit hooks installed."
-            echo "::notice::Please see https://github.com/espressif/esp-protocols/blob/master/CONTRIBUTING.md for instructions."
-            echo ""
-            exit 1
-          fi

.github/workflows/publish-docs-component.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - release-modem-v1.4
 
 env:
   DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_DEPLOY_URL_BASE }}
@@ -55,9 +56,6 @@ jobs:
                 if [[ "${{ env.BUMP_COMPONENT }}" == "${comp}" ]]; then
                   echo "Building specific version of ${comp} (${{ env.BUMP_VERSION }})"
                   ./generate_docs ${{ env.BUMP_VERSION }}
-                else
-                  echo "Building latest version of ${comp}"
-                  ./generate_docs
                 fi
               fi
             done
@@ -67,16 +65,6 @@ jobs:
             source $GITHUB_WORKSPACE/docs/utils.sh
             add_doc_server_ssh_keys $DOCS_DEPLOY_KEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
             export GIT_VER=$(git describe --always)
-            export GITHUB_REF_NAME=latest
-            for comp in  `ls components`; do
-              if [[ -d $GITHUB_WORKSPACE/docs/${comp} ]]; then
-                echo "Deploying latest of ${comp}"
-                export DOCS_BUILD_DIR=$GITHUB_WORKSPACE/docs/${comp}
-                export DOCS_DEPLOY_PATH=$DOCS_DEPLOY_PATH_ORIG/${comp}
-                cd $GITHUB_WORKSPACE/docs/${comp}
-                deploy-docs
-              fi
-            done;
             # Deploy docs with version path
             if [[ "${{ env.BUMP_VERSION }}" != "" ]] && [[ -d $GITHUB_WORKSPACE/docs/${{ env.BUMP_COMPONENT }} ]]; then
                 echo "Deploying specific version of ${{ env.BUMP_COMPONENT }} (${{ env.BUMP_VERSION }})"
@@ -103,6 +91,5 @@ jobs:
             components/mosquitto;
             components/sock_utils;
             components/libwebsockets;
-            components/esp_dns;
           namespace: "espressif"
           api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}

.github/workflows/sockutls_build.yml

@@ -28,7 +28,7 @@ jobs:
         shell: bash
         run: |
           . ${IDF_PATH}/export.sh
-          pip install idf-build-apps --upgrade
+          pip install idf-component-manager idf-build-apps --upgrade
           python ci/build_apps.py ${TEST_DIR}
           cd ${TEST_DIR}
           ${GITHUB_WORKSPACE}/ci/clean_build_artifacts.sh `pwd`/${TARGET_TEST_DIR}
@@ -87,20 +87,6 @@ jobs:
       - name: Run Test
         working-directory: ${{ env.TEST_DIR }}
         run: |
-          export PYENV_ROOT="$HOME/.pyenv"
-          export PATH="$PYENV_ROOT/bin:$PATH"
-          eval "$(pyenv init --path)"
-          eval "$(pyenv init -)"
-          if ! pyenv versions --bare | grep -q '^3\.12\.6$'; then
-            echo "Installing Python 3.12.6..."
-            pyenv install -s 3.12.6
-          fi
-          if ! pyenv virtualenvs --bare | grep -q '^myenv$'; then
-            echo "Creating pyenv virtualenv 'myenv'..."
-            pyenv virtualenv 3.12.6 myenv
-          fi
-          pyenv activate myenv
-          python --version
           unzip ci/artifacts.zip -d ci
           for dir in `ls -d ci/build_*`; do
           rm -rf build sdkconfig.defaults

.github/workflows/tls_cxx__build.yml

@@ -26,5 +26,5 @@ jobs:
         shell: bash
         run: |
           . ${IDF_PATH}/export.sh
-          pip install idf-build-apps --upgrade
+          pip install idf-component-manager idf-build-apps --upgrade
           python ./ci/build_apps.py ./components/mbedtls_cxx/${{ matrix.test.path }} -vv --preserve-all

.github/workflows/websocket__build-target-test.yml

@@ -65,27 +65,14 @@ jobs:
         with:
           name: websocket_bin_esp32_${{ matrix.idf_ver }}_${{ matrix.test.app }}
           path: ${{ env.TEST_DIR }}/ci/
-      - name: Run Example Test on target
-        working-directory: ${{ env.TEST_DIR }}
+      - name: Install Python packages
         env:
           PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple"
         run: |
-          export PYENV_ROOT="$HOME/.pyenv"
-          export PATH="$PYENV_ROOT/bin:$PATH"
-          eval "$(pyenv init --path)"
-          eval "$(pyenv init -)"
-          if ! pyenv versions --bare | grep -q '^3\.12\.6$'; then
-            echo "Installing Python 3.12.6..."
-            pyenv install -s 3.12.6
-          fi
-          if ! pyenv virtualenvs --bare | grep -q '^myenv$'; then
-            echo "Creating pyenv virtualenv 'myenv'..."
-            pyenv virtualenv 3.12.6 myenv
-          fi
-          pyenv activate myenv
-          python --version
-          pip install --prefer-binary cryptography pytest-embedded pytest-embedded-serial-esp pytest-embedded-idf pytest-custom_exit_code esptool
-          pip install --extra-index-url https://dl.espressif.com/pypi/ -r $GITHUB_WORKSPACE/ci/requirements.txt
+          pip install --only-binary cryptography --extra-index-url https://dl.espressif.com/pypi/ -r $GITHUB_WORKSPACE/ci/requirements.txt
+      - name: Run Example Test on target
+        working-directory: ${{ env.TEST_DIR }}
+        run: |
           unzip ci/artifacts.zip -d ci
           for dir in `ls -d ci/build_*`; do
           rm -rf build sdkconfig.defaults

.gitignore

@@ -94,9 +94,3 @@ docs/html
 
 # esp-idf managed components
 **/managed_components/**
-
-# modem simulator uses esp-at clone
-common_components/modem_sim/modem_sim_esp32/
-
-# repository release tools
-release_notes.txt

.pre-commit-config.yaml

@@ -25,8 +25,12 @@ repos:
            (?x)^(
                .*.py
            )$
-  - repo: https://github.com/google/yapf
-    rev: "v0.43.0"
+  - repo: https://github.com/myint/unify
+    rev: v0.5
+    hooks:
+      - id: unify
+  - repo: https://github.com/pre-commit/mirrors-yapf
+    rev: "v0.32.0"
     hooks:
       - id: yapf
         args: ['style={based_on_style: google, column_limit: 160, indent_width: 4}']
@@ -35,7 +39,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/myint/eradicate/
-    rev: 3.0.0
+    rev: v2.1.0
     hooks:
       - id: eradicate
   - repo: https://github.com/espressif/check-copyright/
@@ -57,8 +61,8 @@ repos:
   - repo: local
     hooks:
       - id: commit message scopes
-        name: "commit message must be scoped with: mdns, dns, modem, websocket, asio, mqtt_cxx, console, common, eppp, tls_cxx, mosq, sockutls, lws, modem_sim"
-        entry: '\A(?!(feat|fix|ci|bump|test|docs|chore)\((mdns|dns|modem|common|console|websocket|asio|mqtt_cxx|examples|eppp|tls_cxx|mosq|sockutls|lws|modem_sim)\)\:)'
+        name: "commit message must be scoped with: mdns, modem, websocket, asio, mqtt_cxx, console, common, eppp, tls_cxx, mosq, sockutls, lws"
+        entry: '\A(?!(feat|fix|ci|bump|test|docs|chore)\((mdns|modem|common|console|websocket|asio|mqtt_cxx|examples|eppp|tls_cxx|mosq|sockutls|lws)\)\:)'
         language: pygrep
         args: [--multiline]
         stages: [commit-msg]

README.md

@@ -70,11 +70,3 @@ Please refer to instructions in [ESP-IDF](https://github.com/espressif/esp-idf)
 ### libwebsockets
 
 * Brief introduction [README](components/libwebsockets/README.md)
-
-### console_cmd_mqtt
-
-* Brief introduction [README](components/console_cmd_mqtt/README.md)
-
-### esp_dns
-
-* Brief introduction [README](components/esp_dns/README.md)

ci/config_env.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# This script is used to set some common variables for the CI pipeline.
-
-set -e
-
-# MQTT public broker URI
-export CI_MQTT_BROKER_URI="test.mosquitto.org"

ci/ignore_build_warnings.txt

@@ -1,9 +1 @@
 DeprecationWarning: pkg_resources is deprecated as an API
-Warning: Deprecated: Option '--flash_size' is deprecated. Use '--flash-size' instead.
-Warning: Deprecated: Option '--flash_mode' is deprecated. Use '--flash-mode' instead.
-Warning: Deprecated: Option '--flash_freq' is deprecated. Use '--flash-freq' instead.
-Warning: Deprecated: Command 'sign_data' is deprecated. Use 'sign-data' instead.
-Warning: Deprecated: Command 'extract_public_key' is deprecated. Use 'extract-public-key' instead.
-warning: unknown kconfig symbol 'EXAMPLE_ETH_PHY_IP101'
-WARNING: The following Kconfig variables were used in "if" clauses, but not
-warning: unknown kconfig symbol 'LIBC_NEWLIB'

ci/requirements.txt

@@ -6,4 +6,3 @@ dpkt
 pytest
 idf_build_apps
 netifaces
-esptool>=5.1.0

common_components/modem_sim/README.md

@@ -1,51 +0,0 @@
-# Modem Simulator Component
-
-A Wi-Fi modem simulator that extends ESP-AT with PPP server capabilities, turning ESP32 into a fully functional Wi-Fi modem. Perfect for testing AT commands and PPP connections without real hardware dependencies.
-
-## What it does
-
-- Extends ESP-AT firmware with PPP server functionality
-- Provides DATA mode for raw IP communication
-- Enables existing communication stacks (MQTT, HTTP, custom protocols) to work over Wi-Fi
-- Ideal for testing ESP-Modem library and CI reliability
-
-## Quick Start
-
-```bash
-cd common_components/modem_sim
-./install.sh
-source export.sh
-idf.py build
-```
-
-## Custom Platform/Module
-
-```bash
-./install.sh PLATFORM_ESP32S3 WROOM-32
-```
-
-## Configuration
-
-The `sdkconfig.defaults` includes:
-- Wi-Fi and Bluetooth enabled
-- PPP server support
-- AT commands for HTTP/MQTT
-- 4MB flash configuration
-
-## Project Structure
-
-```
-modem_sim/
-├── install.sh              # Installation script
-├── export.sh               # Environment setup
-├── sdkconfig.defaults      # Default configuration
-├── pppd_cmd/               # Custom PPP commands
-└── modem_sim_esp32/        # Generated ESP-AT build
-```
-
-## Use Cases
-
-- Testing ESP-Modem library without real hardware
-- Quick Wi-Fi connectivity for existing communication stacks
-- CI/CD testing with reliable modem simulation
-- Development and debugging of AT command implementations

common_components/modem_sim/esp32.sdkconfig.defaults

@@ -1,79 +0,0 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) 5.4.1 Project Minimal Configuration
-#
-CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
-CONFIG_APP_PROJECT_VER_FROM_CONFIG=y
-CONFIG_APP_PROJECT_VER="v4.1.0.0-dev"
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="module_config/module_esp32_default/partitions_at.csv"
-CONFIG_PARTITION_TABLE_MD5=n
-CONFIG_AT_CUSTOMIZED_PARTITION_TABLE_FILE="module_config/module_esp32_default/at_customize.csv"
-CONFIG_BT_ENABLED=y
-CONFIG_BT_BTU_TASK_STACK_SIZE=5120
-CONFIG_BT_BLE_BLUFI_ENABLE=y
-CONFIG_BT_STACK_NO_LOG=y
-CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
-CONFIG_BTDM_CTRL_MODE_BTDM=y
-CONFIG_BTDM_CTRL_LPCLK_SEL_EXT_32K_XTAL=y
-CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=200
-CONFIG_ESP_TLS_PSK_VERIFICATION=y
-CONFIG_ESP_TLS_INSECURE=y
-CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y
-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n
-CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL=y
-CONFIG_ETH_DMA_RX_BUFFER_NUM=3
-CONFIG_ETH_DMA_TX_BUFFER_NUM=3
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
-CONFIG_HTTPD_MAX_URI_LEN=1024
-CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
-CONFIG_RTC_CLK_SRC_EXT_CRYS=y
-CONFIG_RTC_EXT_CRYST_ADDIT_CURRENT=y
-CONFIG_RTC_CLK_CAL_CYCLES=1024
-CONFIG_PM_ENABLE=y
-CONFIG_PM_SLP_DISABLE_GPIO=y
-CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80=y
-CONFIG_ESP_TASK_WDT_PANIC=y
-CONFIG_ESP_TASK_WDT_TIMEOUT_S=60
-CONFIG_ESP_DEBUG_OCDAWARE=n
-CONFIG_ESP_WIFI_IRAM_OPT=n
-CONFIG_ESP_WIFI_RX_IRAM_OPT=n
-CONFIG_ESP_WIFI_SLP_IRAM_OPT=y
-CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT=y
-CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=0
-CONFIG_FATFS_LFN_HEAP=y
-CONFIG_FREERTOS_UNICORE=y
-CONFIG_FREERTOS_HZ=1000
-CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
-CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=n
-CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
-CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH=y
-CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
-CONFIG_LWIP_MAX_SOCKETS=16
-CONFIG_LWIP_SO_LINGER=y
-CONFIG_LWIP_SO_RCVBUF=y
-CONFIG_LWIP_IP4_REASSEMBLY=y
-CONFIG_LWIP_IP6_REASSEMBLY=y
-CONFIG_LWIP_IPV6_AUTOCONFIG=y
-CONFIG_LWIP_TCP_MAXRTX=6
-CONFIG_LWIP_TCP_SYNMAXRTX=3
-CONFIG_LWIP_PPP_SUPPORT=y
-CONFIG_LWIP_PPP_SERVER_SUPPORT=y
-CONFIG_LWIP_SNTP_MAX_SERVERS=3
-CONFIG_LWIP_SNTP_STARTUP_DELAY=n
-CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
-CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
-CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=n
-CONFIG_MBEDTLS_HAVE_TIME_DATE=y
-CONFIG_MBEDTLS_DHM_C=y
-CONFIG_NEWLIB_NANO_FORMAT=y
-CONFIG_VFS_SUPPORT_TERMIOS=n
-CONFIG_WL_SECTOR_SIZE_512=y
-CONFIG_AT_PROCESS_TASK_STACK_SIZE=6144
-CONFIG_AT_MQTT_COMMAND_SUPPORT=y
-CONFIG_AT_HTTP_COMMAND_SUPPORT=y
-CONFIG_AT_BLE_COMMAND_SUPPORT=n
-CONFIG_AT_BLE_HID_COMMAND_SUPPORT=n
-CONFIG_AT_BLUFI_COMMAND_SUPPORT=n
-CONFIG_LWIP_IP_FORWARD=y
-CONFIG_LWIP_IPV4_NAPT=y

common_components/modem_sim/esp32c6.sdkconfig.defaults

@@ -1,63 +0,0 @@
-# This file was generated using idf.py save-defconfig. It can be edited manually.
-# Espressif IoT Development Framework (ESP-IDF) 5.4.1 Project Minimal Configuration
-#
-CONFIG_IDF_TARGET="esp32c6"
-CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
-CONFIG_APP_PROJECT_VER_FROM_CONFIG=y
-CONFIG_APP_PROJECT_VER="v4.1.0.0-dev"
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="module_config/module_esp32c6_default/partitions_at.csv"
-CONFIG_PARTITION_TABLE_MD5=n
-CONFIG_AT_CUSTOMIZED_PARTITION_TABLE_FILE="module_config/module_esp32c6_default/at_customize.csv"
-CONFIG_AT_CUSTOMIZED_PARTITION_TABLE_OFFSET=0x1e000
-CONFIG_ESP_TLS_PSK_VERIFICATION=y
-CONFIG_ESP_TLS_INSECURE=y
-CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY=y
-CONFIG_ESP_ERR_TO_NAME_LOOKUP=n
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
-CONFIG_HTTPD_MAX_URI_LEN=1024
-CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP=y
-CONFIG_RTC_CLK_SRC_EXT_CRYS=y
-CONFIG_RTC_CLK_CAL_CYCLES=1024
-CONFIG_ESP_PHY_MAC_BB_PD=y
-CONFIG_PM_ENABLE=y
-CONFIG_PM_DFS_INIT_AUTO=y
-CONFIG_ESP_TASK_WDT_PANIC=y
-CONFIG_ESP_TASK_WDT_TIMEOUT_S=60
-CONFIG_ESP_DEBUG_OCDAWARE=n
-CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT=y
-CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=0
-CONFIG_FATFS_LFN_HEAP=y
-CONFIG_FREERTOS_HZ=1000
-CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
-CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=n
-CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
-CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
-CONFIG_LWIP_MAX_SOCKETS=16
-CONFIG_LWIP_SO_LINGER=y
-CONFIG_LWIP_SO_RCVBUF=y
-CONFIG_LWIP_IP4_REASSEMBLY=y
-CONFIG_LWIP_IP6_REASSEMBLY=y
-CONFIG_LWIP_IPV6_AUTOCONFIG=y
-CONFIG_LWIP_TCP_MAXRTX=6
-CONFIG_LWIP_TCP_SYNMAXRTX=3
-CONFIG_LWIP_PPP_SUPPORT=y
-CONFIG_LWIP_PPP_SERVER_SUPPORT=y
-CONFIG_LWIP_SNTP_MAX_SERVERS=3
-CONFIG_LWIP_SNTP_STARTUP_DELAY=n
-CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
-CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
-CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=n
-CONFIG_MBEDTLS_HAVE_TIME_DATE=y
-CONFIG_MBEDTLS_DHM_C=y
-CONFIG_NEWLIB_NANO_FORMAT=y
-CONFIG_VFS_SUPPORT_TERMIOS=n
-CONFIG_WL_SECTOR_SIZE_512=y
-CONFIG_AT_PROCESS_TASK_STACK_SIZE=6144
-CONFIG_AT_MDNS_COMMAND_SUPPORT=n
-CONFIG_AT_WPS_COMMAND_SUPPORT=n
-CONFIG_AT_SMARTCONFIG_COMMAND_SUPPORT=n
-CONFIG_AT_PING_COMMAND_SUPPORT=n
-CONFIG_LWIP_IP_FORWARD=y
-CONFIG_LWIP_IPV4_NAPT=y

common_components/modem_sim/export.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-source $IDF_PATH/export.sh
-
-export AT_CUSTOM_COMPONENTS="`pwd`/pppd_cmd"
-
-cd modem_sim_esp32/esp-at
-
-python -m pip install -r requirements.txt
-
-python build.py reconfigure

common_components/modem_sim/install.sh

@@ -1,98 +0,0 @@
-#!/bin/bash
-set -e
-
-# Create directory "modem_sim_esp32", go inside it
-# Usage: ./install.sh [platform] [module] [uart_tx_pin] [uart_rx_pin]
-
-SCRIPT_DIR=$(pwd)
-UPDATE_UART_PINS_SCRIPT="$(cd "$(dirname "$0")" && pwd)/update_uart_pins.py"
-mkdir -p modem_sim_esp32
-cd modem_sim_esp32
-
-if [ -z "$IDF_PATH" ]; then
-    echo "Error: IDF_PATH environment variable is not set"
-    exit 1
-fi
-
-# Default ESP_AT_VERSION uses this specific commit from master to support new chips and features
-ESP_AT_VERSION="aa9d7e0e9b741744f7bf5bec3bbf887cff033d5f"
-
-# Shallow clone of esp-at.git at $ESP_AT_VERSION
-if [ ! -d "esp-at" ]; then
-    # cannot shallow clone from a specific commit, so we init, shallow fetch, and checkout
-    mkdir -p esp-at && cd esp-at && git init && git remote add origin https://github.com/espressif/esp-at.git
-    git fetch --depth 1 origin $ESP_AT_VERSION && git checkout $ESP_AT_VERSION
-else
-    echo "esp-at directory already exists, skipping clone."
-    cd esp-at
-fi
-
-# Add esp-idf directory which is a symlink to the $IDF_PATH
-if [ ! -L "esp-idf" ]; then
-    ln -sf "$IDF_PATH" esp-idf
-else
-    echo "esp-idf symlink already exists, skipping."
-fi
-
-# Create "build" directory
-mkdir -p build
-
-# Default values for platform and module
-platform="PLATFORM_ESP32"
-module="WROOM-32"
-uart_tx_pin=""
-uart_rx_pin=""
-
-# Override defaults if parameters are provided
-if [ ! -z "$1" ]; then
-    platform="$1"
-fi
-if [ ! -z "$2" ]; then
-    module="$2"
-fi
-if [ ! -z "$3" ]; then
-    uart_tx_pin="$3"
-fi
-if [ ! -z "$4" ]; then
-    uart_rx_pin="$4"
-fi
-
-target="${platform##*_}"
-target="${target,,}"
-
-# Use provided pins for description when present; otherwise keep defaults
-description="4MB, Wi-Fi + BLE, OTA, TX:17 RX:16"
-if [ -n "$uart_tx_pin" ] || [ -n "$uart_rx_pin" ]; then
-    desc_tx=${uart_tx_pin:-17}
-    desc_rx=${uart_rx_pin:-16}
-    description="4MB, Wi-Fi + BLE, OTA, TX:${desc_tx} RX:${desc_rx}"
-fi
-
-# Create file "build/module_info.json" with content
-cat > build/module_info.json << EOF
-{
-    "platform": "$platform",
-    "module": "$module",
-    "description": "$description",
-    "silence": 0
-}
-EOF
-
-# Optionally update UART pins in factory_param_data.csv for the selected module
-if [ -n "$uart_tx_pin" ] || [ -n "$uart_rx_pin" ]; then
-    csv_path="components/customized_partitions/raw_data/factory_param/factory_param_data.csv"
-    if [ ! -f "$csv_path" ]; then
-        echo "Warning: $csv_path not found; skipping UART pin update."
-    else
-        python3 "$UPDATE_UART_PINS_SCRIPT" "$platform" "$module" "$uart_tx_pin" "$uart_rx_pin" "$csv_path"
-        echo "Updated UART pins in $csv_path"
-    fi
-fi
-
-# Copy the platform-specific sdkconfig.defaults file if it exists
-if [ -f "$SCRIPT_DIR/${target}.sdkconfig.defaults" ]; then
-    cp "$SCRIPT_DIR/${target}.sdkconfig.defaults" "module_config/module_${target}_default/sdkconfig.defaults"
-fi
-
-echo "Installation completed successfully!"
-echo "Created modem_sim_esp32 directory with esp-at repository and configuration"

common_components/modem_sim/pppd_cmd/CMakeLists.txt

@@ -1,6 +0,0 @@
-idf_component_register(
-    SRCS additional_commands.c
-    INCLUDE_DIRS include
-    REQUIRES at freertos nvs_flash)
-
-idf_component_set_property(${COMPONENT_NAME} WHOLE_ARCHIVE TRUE)

common_components/modem_sim/pppd_cmd/additional_commands.c

@@ -1,411 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <stdio.h>
-#include <string.h>
-#include <stdbool.h>
-#include "esp_at.h"
-#include "driver/gpio.h"
-#include "driver/uart.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/event_groups.h"
-#include "freertos/semphr.h"
-#include "freertos/queue.h"
-#include "esp_netif.h"
-#include "esp_netif_ppp.h"
-#include "esp_check.h"
-#include "esp_http_server.h"
-#include "esp_timer.h"
-
-static uint8_t at_test_cmd_test(uint8_t *cmd_name)
-{
-    uint8_t buffer[64] = {0};
-    snprintf((char *)buffer, 64, "test command: <AT%s=?> is executed\r\n", cmd_name);
-    esp_at_port_write_data(buffer, strlen((char *)buffer));
-
-    return ESP_AT_RESULT_CODE_OK;
-}
-
-static uint8_t at_query_cmd_test(uint8_t *cmd_name)
-{
-    uint8_t buffer[64] = {0};
-    snprintf((char *)buffer, 64, "query command: <AT%s?> is executed\r\n", cmd_name);
-    esp_at_port_write_data(buffer, strlen((char *)buffer));
-
-    return ESP_AT_RESULT_CODE_OK;
-}
-
-static uint8_t at_setup_cmd_test(uint8_t para_num)
-{
-    uint8_t index = 0;
-    printf("setup command: <AT%s=%d> is executed\r\n", esp_at_get_current_cmd_name(), para_num);
-
-    // get first parameter, and parse it into a digit
-    int32_t digit = 0;
-    if (esp_at_get_para_as_digit(index++, &digit) != ESP_AT_PARA_PARSE_RESULT_OK) {
-        return ESP_AT_RESULT_CODE_ERROR;
-    }
-    printf("digit: %d\r\n", digit);
-
-    // get second parameter, and parse it into a string
-    uint8_t *str = NULL;
-    if (esp_at_get_para_as_str(index++, &str) != ESP_AT_PARA_PARSE_RESULT_OK) {
-        return ESP_AT_RESULT_CODE_ERROR;
-    }
-    printf("string: %s\r\n", str);
-
-    // allocate a buffer and construct the data, then send the data to mcu via interface (uart/spi/sdio/socket)
-    uint8_t *buffer = (uint8_t *)malloc(512);
-    if (!buffer) {
-        return ESP_AT_RESULT_CODE_ERROR;
-    }
-    int len = snprintf((char *)buffer, 512, "setup command: <AT%s=%d,\"%s\"> is executed\r\n",
-                       esp_at_get_current_cmd_name(), digit, str);
-    esp_at_port_write_data(buffer, len);
-
-    // remember to free the buffer
-    free(buffer);
-
-    return ESP_AT_RESULT_CODE_OK;
-}
-
-#define TAG "at_custom_cmd"
-static esp_netif_t *s_netif = NULL;
-static httpd_handle_t http_server = NULL;
-
-static void on_ppp_event(void *arg, esp_event_base_t base, int32_t event_id, void *data)
-{
-    esp_netif_t **netif = data;
-    if (base == NETIF_PPP_STATUS && event_id == NETIF_PPP_ERRORUSER) {
-        printf("Disconnected!");
-    }
-}
-
-static void on_ip_event(void *arg, esp_event_base_t base, int32_t event_id, void *data)
-{
-    ip_event_got_ip_t *event = (ip_event_got_ip_t *)data;
-    esp_netif_t *netif = event->esp_netif;
-    if (event_id == IP_EVENT_PPP_GOT_IP) {
-        printf("Got IPv4 event: Interface \"%s(%s)\" address: " IPSTR, esp_netif_get_desc(netif),
-               esp_netif_get_ifkey(netif), IP2STR(&event->ip_info.ip));
-        ESP_ERROR_CHECK(esp_netif_napt_enable(s_netif));
-
-    } else if (event_id == IP_EVENT_PPP_LOST_IP) {
-        ESP_LOGI(TAG, "Disconnected");
-    }
-}
-
-static SemaphoreHandle_t at_sync_sema = NULL;
-static void wait_data_callback(void)
-{
-    static uint8_t buffer[1500] = {0};
-    int len = esp_at_port_read_data(buffer, sizeof(buffer) - 1);
-
-    // Check for the escape sequence "+++" in the received data
-    const uint8_t escape_seq[] = "+++";
-    uint8_t *escape_ptr = memmem(buffer, len, escape_seq, 3);
-
-    if (escape_ptr != NULL) {
-        printf("Found +++ sequence, signal to the command processing thread\n");
-
-        int data_before_escape = escape_ptr - buffer;
-        if (data_before_escape > 0) {
-            esp_netif_receive(s_netif, buffer, data_before_escape, NULL);
-        }
-
-        if (at_sync_sema) {
-            xSemaphoreGive(at_sync_sema);
-        }
-        return;
-    }
-    esp_netif_receive(s_netif, buffer, len, NULL);
-}
-
-static esp_err_t transmit(void *h, void *buffer, size_t len)
-{
-    printf("transmit: %d bytes\n", len);
-    esp_at_port_write_data(buffer, len);
-    return ESP_OK;
-}
-
-static uint8_t at_exe_cmd_test(uint8_t *cmd_name)
-{
-    uint8_t buffer[64] = {0};
-    snprintf((char *)buffer, 64, "execute command: <AT%s> is executed\r\n", cmd_name);
-    esp_at_port_write_data(buffer, strlen((char *)buffer));
-    printf("Command <AT%s> executed successfully\r\n", cmd_name);
-    if (!at_sync_sema) {
-        at_sync_sema = xSemaphoreCreateBinary();
-        assert(at_sync_sema != NULL);
-        esp_netif_driver_ifconfig_t driver_cfg = {
-            .handle = (void *)1,
-            .transmit = transmit,
-        };
-        const esp_netif_driver_ifconfig_t *ppp_driver_cfg = &driver_cfg;
-
-        esp_netif_inherent_config_t base_netif_cfg = ESP_NETIF_INHERENT_DEFAULT_PPP();
-        esp_netif_config_t netif_ppp_config = { .base = &base_netif_cfg,
-                                                .driver = ppp_driver_cfg,
-                                                .stack = ESP_NETIF_NETSTACK_DEFAULT_PPP
-                                              };
-
-        s_netif = esp_netif_new(&netif_ppp_config);
-        esp_netif_ppp_config_t netif_params;
-        ESP_ERROR_CHECK(esp_netif_ppp_get_params(s_netif, &netif_params));
-        netif_params.ppp_our_ip4_addr.addr = ESP_IP4TOADDR(192, 168, 11, 1);
-        netif_params.ppp_their_ip4_addr.addr = ESP_IP4TOADDR(192, 168, 11, 2);
-        netif_params.ppp_error_event_enabled = true;
-        ESP_ERROR_CHECK(esp_netif_ppp_set_params(s_netif, &netif_params));
-        if (esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, on_ip_event, NULL) != ESP_OK) {
-            printf("Failed to register IP event handler");
-        }
-        if (esp_event_handler_register(NETIF_PPP_STATUS, ESP_EVENT_ANY_ID, on_ppp_event, NULL) !=  ESP_OK) {
-            printf("Failed to register NETIF_PPP_STATUS event handler");
-        }
-
-
-    }
-    esp_at_port_write_data((uint8_t *)"CONNECT\r\n", strlen("CONNECT\r\n"));
-
-    // set the callback function which will be called by AT port after receiving the input data
-    esp_at_port_enter_specific(wait_data_callback);
-    esp_netif_action_start(s_netif, 0, 0, 0);
-    esp_netif_action_connected(s_netif, 0, 0, 0);
-
-    while (xSemaphoreTake(at_sync_sema, pdMS_TO_TICKS(1000)) == pdFALSE) {
-        printf(".");
-    }
-    return ESP_AT_RESULT_CODE_OK;
-}
-
-static uint8_t at_test_cereg(uint8_t *cmd_name)
-{
-    printf("%s: AT command <AT%s> is executed\r\n", __func__, cmd_name);
-    return ESP_AT_RESULT_CODE_OK;
-}
-
-static uint8_t at_query_cereg(uint8_t *cmd_name)
-{
-    printf("%s: AT command <AT%s> is executed\r\n", __func__, cmd_name);
-    static uint8_t buffer[] = "+CEREG: 7,8\r\n";
-    esp_at_port_write_data(buffer, sizeof(buffer));
-    return ESP_AT_RESULT_CODE_OK;
-}
-
-static uint8_t at_setup_cereg(uint8_t num)
-{
-    printf("%s: AT command <AT%d> is executed\r\n", __func__, num);
-    return ESP_AT_RESULT_CODE_OK;
-}
-
-static uint8_t at_exe_cereg(uint8_t *cmd_name)
-{
-    printf("%s: AT command <AT%s> is executed\r\n", __func__, cmd_name);
-    return ESP_AT_RESULT_CODE_OK;
-}
-
-static esp_err_t hello_get_handler(httpd_req_t *req)
-{
-    const char* resp_str = "Hello from ESP-AT HTTP Server!";
-    httpd_resp_send(req, resp_str, HTTPD_RESP_USE_STRLEN);
-    return ESP_OK;
-}
-
-static esp_err_t root_get_handler(httpd_req_t *req)
-{
-    const char* resp_str = "ESP-AT HTTP Server is running";
-    httpd_resp_send(req, resp_str, HTTPD_RESP_USE_STRLEN);
-    return ESP_OK;
-}
-
-static esp_err_t test_get_handler(httpd_req_t *req)
-{
-    const char* resp_str = "{\"status\":\"success\",\"message\":\"Test endpoint working\",\"timestamp\":12345}";
-    httpd_resp_set_type(req, "application/json");
-    httpd_resp_send(req, resp_str, HTTPD_RESP_USE_STRLEN);
-    return ESP_OK;
-}
-
-static esp_err_t async_get_handler(httpd_req_t *req)
-{
-    printf("Starting async chunked response handler\r\n");
-
-    // Set content type for plain text response
-    httpd_resp_set_type(req, "text/plain");
-
-    // Static counter to track requests
-    static uint8_t req_count = 0;
-    req_count++;
-
-    // Send initial response with request count
-    char buffer[256];
-    snprintf(buffer, sizeof(buffer), "=== Async Response #%d ===\r\n", req_count);
-    httpd_resp_sendstr_chunk(req, buffer);
-
-    // Long message broken into chunks
-    const char* chunks[] = {
-        "This is a simulated slow server response.\r\n",
-        "Chunk 1: The ESP-AT HTTP server is demonstrating...\r\n",
-        "Chunk 2: ...asynchronous chunked transfer encoding...\r\n",
-        "Chunk 3: ...with artificial delays between chunks...\r\n",
-        "Chunk 4: ...to simulate real-world network conditions.\r\n",
-        "Chunk 5: Processing data... please wait...\r\n",
-        "Chunk 6: Still processing... almost done...\r\n",
-        "Chunk 7: Final chunk - transfer complete!\r\n",
-        "=== END OF RESPONSE ===\r\n"
-    };
-
-    int num_chunks = sizeof(chunks) / sizeof(chunks[0]);
-
-    // Send each chunk with delays
-    for (int i = 0; i < num_chunks; i++) {
-        // Add a delay to simulate slow processing
-        vTaskDelay(pdMS_TO_TICKS(1500)); // 1.5 second delay between chunks
-
-        // Add chunk number and timestamp
-        snprintf(buffer, sizeof(buffer), "[%d/%d] [%d ms] %s",
-                 i + 1, num_chunks, (int)(esp_timer_get_time() / 1000), chunks[i]);
-
-        printf("Sending chunk %d: %s", i + 1, chunks[i]);
-        httpd_resp_sendstr_chunk(req, buffer);
-    }
-
-    // Add final summary
-    vTaskDelay(pdMS_TO_TICKS(500));
-    snprintf(buffer, sizeof(buffer), "\r\nTransfer completed in %d chunks with delays.\r\n", num_chunks);
-    httpd_resp_sendstr_chunk(req, buffer);
-
-    // Send NULL to signal end of chunked transfer
-    httpd_resp_sendstr_chunk(req, NULL);
-
-    printf("Async chunked response completed\r\n");
-    return ESP_OK;
-}
-
-static const httpd_uri_t hello = {
-    .uri       = "/hello",
-    .method    = HTTP_GET,
-    .handler   = hello_get_handler,
-    .user_ctx  = NULL
-};
-
-static const httpd_uri_t root = {
-    .uri       = "/",
-    .method    = HTTP_GET,
-    .handler   = root_get_handler,
-    .user_ctx  = NULL
-};
-
-static const httpd_uri_t test = {
-    .uri       = "/test",
-    .method    = HTTP_GET,
-    .handler   = test_get_handler,
-    .user_ctx  = NULL
-};
-
-static const httpd_uri_t async_uri = {
-    .uri       = "/async",
-    .method    = HTTP_GET,
-    .handler   = async_get_handler,
-    .user_ctx  = NULL
-};
-
-static esp_err_t start_http_server(void)
-{
-    if (http_server != NULL) {
-        printf("HTTP server already running\r\n");
-        return ESP_OK;
-    }
-
-    httpd_config_t config = HTTPD_DEFAULT_CONFIG();
-    config.server_port = 8080;
-    config.lru_purge_enable = true;
-
-    printf("Starting HTTP server on port: %d\r\n", config.server_port);
-    if (httpd_start(&http_server, &config) == ESP_OK) {
-        printf("Registering URI handlers\r\n");
-        httpd_register_uri_handler(http_server, &hello);
-        httpd_register_uri_handler(http_server, &root);
-        httpd_register_uri_handler(http_server, &test);
-        httpd_register_uri_handler(http_server, &async_uri);
-        return ESP_OK;
-    }
-
-    printf("Error starting HTTP server!\r\n");
-    return ESP_FAIL;
-}
-
-static esp_err_t stop_http_server(void)
-{
-    if (http_server != NULL) {
-        httpd_stop(http_server);
-        http_server = NULL;
-        printf("HTTP server stopped\r\n");
-        return ESP_OK;
-    }
-    return ESP_OK;
-}
-
-/* HTTP Server AT Commands */
-static uint8_t at_test_httpd(uint8_t *cmd_name)
-{
-    uint8_t buffer[64] = {0};
-    snprintf((char *)buffer, 64, "AT%s=<0/1> - Start/Stop HTTP server\r\n", cmd_name);
-    esp_at_port_write_data(buffer, strlen((char *)buffer));
-    return ESP_AT_RESULT_CODE_OK;
-}
-
-static uint8_t at_query_httpd(uint8_t *cmd_name)
-{
-    uint8_t buffer[64] = {0};
-    snprintf((char *)buffer, 64, "+HTTPD:%d\r\n", http_server != NULL ? 1 : 0);
-    esp_at_port_write_data(buffer, strlen((char *)buffer));
-    return ESP_AT_RESULT_CODE_OK;
-}
-
-static uint8_t at_setup_httpd(uint8_t para_num)
-{
-    int32_t action = 0;
-    if (esp_at_get_para_as_digit(0, &action) != ESP_AT_PARA_PARSE_RESULT_OK) {
-        return ESP_AT_RESULT_CODE_ERROR;
-    }
-
-    if (action == 1) {
-        if (start_http_server() == ESP_OK) {
-            printf("HTTP server started successfully\r\n");
-            return ESP_AT_RESULT_CODE_OK;
-        }
-    } else if (action == 0) {
-        if (stop_http_server() == ESP_OK) {
-            return ESP_AT_RESULT_CODE_OK;
-        }
-    }
-
-    return ESP_AT_RESULT_CODE_ERROR;
-}
-
-static uint8_t at_exe_httpd(uint8_t *cmd_name)
-{
-    // Default action: start server
-    if (start_http_server() == ESP_OK) {
-        printf("HTTP server started via execute command\r\n");
-        return ESP_AT_RESULT_CODE_OK;
-    }
-    return ESP_AT_RESULT_CODE_ERROR;
-}
-
-
-static const esp_at_cmd_struct at_custom_cmd[] = {
-    {"+PPPD", at_test_cmd_test, at_query_cmd_test, at_setup_cmd_test, at_exe_cmd_test},
-    {"+CEREG", at_test_cereg, at_query_cereg, at_setup_cereg, at_exe_cereg},
-    {"+HTTPD", at_test_httpd, at_query_httpd, at_setup_httpd, at_exe_httpd},
-};
-
-bool esp_at_custom_cmd_register(void)
-{
-    return esp_at_custom_cmd_array_regist(at_custom_cmd, sizeof(at_custom_cmd) / sizeof(esp_at_cmd_struct));
-}
-
-ESP_AT_CMD_SET_INIT_FN(esp_at_custom_cmd_register, 1);

common_components/modem_sim/pppd_cmd/include/at_custom_cmd.h

@@ -1,12 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#pragma once
-#include "esp_at_core.h"
-#include "esp_at.h"
-
-/**
- * @brief You can include more header files here for your own AT commands.
- */

common_components/modem_sim/update_uart_pins.py

@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-# SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
-# SPDX-License-Identifier: Unlicense OR CC0-1.0
-import csv
-import pathlib
-import sys
-
-
-def update_uart_pins(platform: str, module: str, tx_pin: str, rx_pin: str, csv_path: str) -> None:
-    path = pathlib.Path(csv_path)
-    rows = []
-    found = False
-
-    with path.open(newline="") as f:
-        reader = csv.DictReader(f)
-        fieldnames = reader.fieldnames
-        for row in reader:
-            if row.get("platform") == platform and row.get("module_name") == module:
-                if tx_pin:
-                    row["uart_tx_pin"] = tx_pin
-                if rx_pin:
-                    row["uart_rx_pin"] = rx_pin
-                found = True
-            rows.append(row)
-
-    if not found:
-        print(f"Warning: no row updated for platform={platform} module={module}")
-
-    with path.open("w", newline="") as f:
-        writer = csv.DictWriter(f, fieldnames=fieldnames)
-        writer.writeheader()
-        writer.writerows(rows)
-
-
-def main() -> int:
-    if len(sys.argv) != 6:
-        print("Usage: update_uart_pins.py <platform> <module> <uart_tx_pin> <uart_rx_pin> <csv_path>")
-        return 1
-
-    platform, module, tx_pin, rx_pin, csv_path = sys.argv[1:6]
-    update_uart_pins(platform, module, tx_pin, rx_pin, csv_path)
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

components/asio/examples/ssl_client_server/main/asio_ssl_main.cpp

@@ -17,8 +17,6 @@
 #include "asio/ssl.hpp"
 #include "asio/buffer.hpp"
 #include "esp_pthread.h"
-// allows for direct access to mbedtls specifics
-#include "asio/ssl/mbedtls_specific.hpp"
 
 extern const unsigned char server_pem_start[] asm("_binary_srv_crt_start");
 extern const unsigned char server_pem_end[]   asm("_binary_srv_crt_end");
@@ -219,7 +217,6 @@ void ssl_server_thread()
     io_context.run();
 }
 
-
 void ssl_client_thread()
 {
     asio::io_context io_context;
@@ -232,11 +229,6 @@ void ssl_client_thread()
     asio::ssl::context ctx(asio::ssl::context::tls_client);
 #if CONFIG_EXAMPLE_CLIENT_VERIFY_PEER
     ctx.add_certificate_authority(cert_chain);
-    // mbedtls (from 3.6.3) requires hostname to be set when performing TLS handshake with verify-peer option
-    // asio::ssl allows for name verification using verification callback, i.e. socket_.set_verify_callback(asio::ssl::host_name_verification()),
-    // - which is not supported in Espressif ASIO port yet.
-    // Therefore we provide a way to directly use mbedtls API and here we just configure the expected hostname to verify
-    asio::ssl::mbedtls::set_hostname(ctx.native_handle(), server_ip);
 #endif // CONFIG_EXAMPLE_CLIENT_VERIFY_PEER
 
     Client c(io_context, ctx, endpoints);

components/asio/examples/ssl_client_server/main/ca.crt

@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIUb25LYOLubieEbKPQDiM+8T5p4yUwDQYJKoZIhvcNAQEL
+MIIDkzCCAnugAwIBAgIUNI5wldYysh6rtCzYmda6H414aRswDQYJKoZIhvcNAQEL
 BQAwWTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
 GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJRXNwcmVzc2lmMB4X
-DTI1MDQwNzA5NDkzOFoXDTQ1MDQwMjA5NDkzOFowWTELMAkGA1UEBhMCQVUxEzAR
+DTIwMDEyMTA5MDk0NloXDTI1MDEyMDA5MDk0NlowWTELMAkGA1UEBhMCQVUxEzAR
 BgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5
 IEx0ZDESMBAGA1UEAwwJRXNwcmVzc2lmMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEArJsjwSNjPOBpTCRW+pIag9gJgRaNIjscea/ilRYRwAnqWKLNssNw
-Kye79KmQ5TxnOEvBIYjesArst1l7MghPLaELscCKo96jzCkSmgPLbxPs+5/E4daO
-9ItxOSH2mjOgG5yFQLEb8xOvsvWWrJAUBj6RBjhzgSYLYRbesWKAyVi9fxSuzfZm
-ROV0B2NsO1PlUDzweo9RYSuvpyNR3kddNnc6lJLXtZhf6IHczjFDFd5/PQuzLIO/
-Dbg+5AMpQykbMFhcQI/Y49GlMMXFDIaWjP+XfE/yUJ4GyYd2EzpDFDFMisnkuR9d
-LQgSXZNwygO8SIfYnnm1pwcGuG/fCQZYpQIDAQABo1MwUTAdBgNVHQ4EFgQUMTUG
-OZ7ujyz7oXSuhDgbpoPRo1cwHwYDVR0jBBgwFoAUMTUGOZ7ujyz7oXSuhDgbpoPR
-o1cwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAD5JwzRVEvnTK
-R2bfMNy60FmFNTOEEYP+XYoNGBiXVY3MRrWlfbY5Pbs4Nq7sCfzEWMj2UsjFmjZE
-DU6FdsaL6rhnps03MR5yiuE5w2aPiH/ijgzVfZtdLe6nKcnrv1YInjEKk+Y3qGu6
-2ZC+MEINPBfRiuN6gCAdxGiK81J4FPLlZImLO/g/0fSrIXCzBUzjoYRYjsy5AP60
-0kbaoGA/SshP0aeNvWB0wUab40idGXBFJ3vnEfMbLIMdc/uCqnzRpqK0m1DacwrI
-nTUMl0bI302Oa/gym+Ma0nJ1nVADcLKoZ1syWjyzIcl6zr+ITY5S+pbeO/geQgKh
-NSUkahX6MQ==
+MIIBCgKCAQEAyadSpRnIQBVbEAsbpkrKrOMlBOMIUmA8AfNyOYPLfv0Oa5lBiMAV
+3OQDu5tYyFYKwkCUqq65iAm50fPbSH71w1tkja6nZ1yAIM+TvpMlM/WiFGrhY+Tc
+kAcLcKUJyPxrv/glzoVslbqUgIhuhCSKA8uk1+ILcn3nWzPcbcowLx31+AHeZj8h
+bIAdj6vjqxMCFStp4IcA+ikmCk75LCN4vkkifdkebb/ZDNYCZZhpCBnCHyFAjPc4
+7C+FDVGT3/UUeeTy+Mtn+MqUAhB+W0sPDm1n2h59D4Z/MFm0hl6GQCAKeMJPzssU
+BBsRm6zoyPQ4VTqG0uwfNNbORyIfKONMUwIDAQABo1MwUTAdBgNVHQ4EFgQUGYLV
+EkgWzxjpltE6texha7zZVxowHwYDVR0jBBgwFoAUGYLVEkgWzxjpltE6texha7zZ
+VxowDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAb2EF4Zg2XWNb
+eZHnzupCDd9jAhwPqkt7F1OXvxJa/RFUSB9+2izGvikGGhuKY4f0iLuqF+bhExD9
+sapDcdFO2Suh4J3onbwEvmKvsv56K3xhapYg8WwPofpkVirnkwFjpQXGzrYxPujg
+BPmSy3psQrhvOr/WH7SefJv2qr4ikaugfE+3enY4PL+C1dSQAuNo1QGgWsZIu0c8
+TZybNZ13vNVMA+tgj2CM8FR3Etaabwtu3TTcAnO7aoBTix/bLBTuZoczhN8/MhG3
+GylmDzFI8a6aKxQL3Fi4PsM82hRKWu3gfs39sR1Ci4V22v8uO5EWBPK0QZvDSc1a
+KwwxI4zA0w==
 -----END CERTIFICATE-----

components/asio/examples/ssl_client_server/main/regenerate_test_certs.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-# This script generates self-signed certificates for testing purposes only.
-# DO NOT use these certificates in production environments.
-# These certificates are meant for development and testing of SSL/TLS functionality.
-
-# 1. Generate CA private key
-openssl genrsa -out ca.key 2048
-
-# 2. Generate CA certificate (validity: 20 years, CN=Espressif)
-openssl req -x509 -new -nodes -key ca.key -sha256 -days 7300 -out ca.crt -subj "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/CN=Espressif"
-
-# 3. Generate server private key
-openssl genrsa -out server.key 2048
-
-# 4. Generate server Certificate Signing Request (CSR)
-openssl req -new -key server.key -out server.csr -subj "/CN=localhost"
-
-# 5. Generate server certificate signed by CA (validity: 20 years)
-openssl x509 -req -in server.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out srv.crt -days 7300 -sha256
-
-# 6. Clean up intermediate files
-rm server.csr ca.srl

components/asio/examples/ssl_client_server/main/server.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA1zQFgwUxyIteLl5SiciuRBZbn/3KWRmsVpyo5JiYCK9NM3Q8
-dDur/dyQ4y2Mq0RVuM7uZL7VraRA4F9+Tm8D2BJ8q4Ai3nRDiGQkFEfbvX0Wic6P
-P6q7lKm65fnYMvbWHqhMOglr8e4b7dMOFpZdNLRZVcoP4/43+/9dOgOj7TXczTFs
-jnlLJBijOnwABf/xlTpTR7ZbQ3uOlckc0TK/Lqxex+NUq4dXQKa96a/wpA6smW38
-0XU5hvVBmhA9YNK86CIpAVOny9gNM1Wxv+aAdVZigNNi6Hht75neC0DhFqGbfpMi
-nLhW8qGwVtY3T1pM8HrpdAu5plkdvmcDm8tUAwIDAQABAoIBADHwOHc29V58ONa5
-vJ2MnCPgrFJsKlCSzJMst2SUpHMfeuK9zmmKj1bRoC2XnFUB/oJsQpXOUveAbi2i
-+0RoLpQtdhC2I2FLyYAU/OpX4n4OUPSZolQ74luVJ3HGkI0DCp0CoO220f3KK2D8
-4QAM1IQudayavyVBEOzBTXjw71FUCXmg0viBtd7JRSug9FR69PPLWP14uzo1viBA
-dtRsLePDyTatW+bfKkPwDG8hhJoummw+fYRPZbM05aWLmVvTiZ/eQtRq1jkwUNSH
-zXsJiCQbHLqwoXISiEsdagQM8hNW2bw5B+ijCQhWNj2ZZBZPJIRtI75sXiXGy2eC
-kDaP0cECgYEA8GpoGOyVZ+KMm7PVNcNbdLJrjpoNhdVXdGwR+yd3u6EoQ3MMD5tr
-4F7pFtN3IxwLoCSM/dnobysNFdKdQRnOB+o3uLADiPn9REM7ebuGUwUP3BWwkb7S
-orDVPUMA82A1p0T4Dwi+OAPpS5bUoI7S/6ZwheWTdoGZYjCrtsqkeEUCgYEA5Sc5
-sgLFWIqvYUQF/+aLAwjHR/bBD9NkvHgdW8GmgXdnEd0DIKHDpJ2yEK3BbQxVp/Kk
-O2KG1NGyJ9UqA9QQ3q5UgpZNHQBWxz2GUl0jHsy8enhgsZr4K2+wvuw5F5bCdXPe
-m/dyFIGnUJ7ic+DtvDGjXdcwAR8Cgc97m5Pg06cCgYEAgyjqBb78e6KDJ2biyOP9
-fxrfxvqQqhUMEz3qSWTs03ZGaxXW3KTkI5JkA8n2Uzc3uHR4Xv2E6zFHgEJY/G1B
-k9vZ7m5IX3BTFezAA9eknqJCVsWWgMzkSVHD5Bor6JryaoEb+8e/TvwDSPPOqJGC
-12pMNSBcZOirb4AyDhVbySkCgYB3Lu2dHj/SC1+oMR8Ft7y5eUlcroQ/XO1Z8Qck
-ABY/5ABhlBfaUwhUiAhjEFw4AWBTl6m/kUEbU21btkzB7PxRNU6TFOVKnjCENAW2
-tOZdUJL/B7kS5s0ImnDM/EO9dxXwzLENYaed7sk870ZMisJbTV3wosk+7Af7yBQ8
-GK+opQKBgQCdZy3KX2FT8S/K2SjDuRM8uDzJ+IcaqScDhgbJFMlrbWmTSML69oRD
-Ic6xVe5hWkkPIs521gwrQSD5E3dbb2dFmjhUZpZkHdv0u/AUupFN0EaCFb/I2A0P
-fRebd9oKoZjlUrEPeID0kjzbmnPGbtG+gFZYmkRb5iLdcCVAn0O1AQ==
+MIIEogIBAAKCAQEAlUCywNhVv4RO2y9h/XGKZ1azzk3jzHpSBzIGO9LoiA8trC/p
+1ykGaUfYPJllYK4HMhC4fUyE3J7tVL2Eskzl26LNPLbEoaBWZM9NhV3iA1/1EtOu
+p6umLx+y3sDfvK35YAOUbjdAlBfhnJ4r8h7oTsxl3J5jZ18zgjJnJi2NEFq/yTpO
+MiwHLWPjy25fDFixfV9UzSvbgt1JaGPmC7c4QkhHzjyp0+ikuvRIw0p9BBNeqBV2
+da3qBMB5FtodUJTAz6o6OKWbTalLjQi6C1H6z9TnY7IrJBUOy/FWkQH/sEsLdscD
+hHa1Dz2oT203QjhzyOSfnNF95D/1MdNcMt6l0wIDAQABAoIBAC1JJTOoMFRc48RT
+myrYQYNbZlEphv3q+2qdfhC2zMFDwbrmCtCy7PQSzYSNkpoEE8DYG/JAvmtmeWJl
+4pZrCK9ctWM/nWfhC3WpBL97nfEiM20T94F+bn0L5Cz8XqaULv839th+QUTt/hGU
+WIctY5VNJXcMQ+MAmtNdUbjex1d3iuxiKHUo4nDoZ8digKFNdtdP5B5nlMq5chCL
+mxNRcsGsx2dDAxbGUapdTVPWHPJKpLOBoSkluDsfd2KZADFU2R1SJpAX9+RYh3HM
+5FTUdHTUaISxbKkgeDKlEM0lqk2TtGUwCyEj098ewi7Wzsu9w60IplPPUJx5FRG6
+jp3wzLkCgYEAxKp5T20rf/7ysX7x053I7VCjDXUxAaWOEj1uS3AhOkl0NaZg7Di+
+y53fWNkcHdkt2n2LqMt/43UgMYq3TVVcq2eunPNF11e1bJw8CjDafwDs4omwwyVn
+lYhPuB4dK2OAib+vU5Zqpp0kZMoxk2MZVgon8z+s8DW/zmB6aFqAWeUCgYEAwkhC
+OgmXKMdjOCVy5t2f5UbY8Y9rV3w8eUATuJ47MMwLr4pGYnKoEn9JB4ltWrHv/u5S
+fOv3tIrrCEvnCoCbOILwCsY5LqTNXgqova8FB6RpMUQCzhDd8LHuvdHv0WMnMzX1
+3PKuqwh8JS55m4WqZRhzr5BFKG4fHPVs4IcaJVcCgYAzzCaJSdqUKqTnJOUydDNQ
+ddWMHNqccWs62J0tF0pZHLGT089hSAzQejMyJnSmU+Ykzr4y5e44DUg+ZCelIZ93
+saYmxlgVwI8THQ8fLADQRIEfpV4996MRmkZM2vmZzOo03Zyi6lIKsga82Rg3lnk8
+1Q3ynknBNpbfF0AGLhfyFQKBgBYlxJ73HutAJ5hr9HhLBYJOnEaVUehMOlycKGNg
+bmD2sdJWEgYBChXpurqIORYguLo4EuE4ySkkuPxeIr14wbkkfBbOWBBwKxUwY+IT
+xKAFZxR9q1AwbgyVTCEJgKw/AGX/HcMNS0omEnjunmBTUYRq0C1QZgHg490aQUor
+PJjLAoGAevzdTpFlVeuKeYh1oDubGO1LinyXpBv7fPFjl+zu4AVbjojcU6yC4OO6
+QvqopE6SyAECKy8kAOFcESPsGc9Lta2XUvI203z7pIVlNVEcJ0+90mQh3Mn1U46l
+sZ49PdRvNwNb5wvkh1UqNsMlGFbRlzMbIk45ou4311kCobowZek=
 -----END RSA PRIVATE KEY-----

components/asio/examples/ssl_client_server/main/srv.crt

@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC9DCCAdwCFHNjaiCN2RT7W7NHXho8HlgxdAygMA0GCSqGSIb3DQEBCwUAMFkx
+MIIC9DCCAdwCFA1lSIcHwYKdB2UqOrZxZnVgPObTMA0GCSqGSIb3DQEBCwUAMFkx
 CzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMMCUVzcHJlc3NpZjAeFw0yNTA0
-MDcwOTQ5MzhaFw00NTA0MDIwOTQ5MzhaMBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANc0BYMFMciLXi5eUonIrkQW
-W5/9ylkZrFacqOSYmAivTTN0PHQ7q/3ckOMtjKtEVbjO7mS+1a2kQOBffk5vA9gS
-fKuAIt50Q4hkJBRH2719FonOjz+qu5SpuuX52DL21h6oTDoJa/HuG+3TDhaWXTS0
-WVXKD+P+N/v/XToDo+013M0xbI55SyQYozp8AAX/8ZU6U0e2W0N7jpXJHNEyvy6s
-XsfjVKuHV0Cmvemv8KQOrJlt/NF1OYb1QZoQPWDSvOgiKQFTp8vYDTNVsb/mgHVW
-YoDTYuh4be+Z3gtA4Rahm36TIpy4VvKhsFbWN09aTPB66XQLuaZZHb5nA5vLVAMC
-AwEAATANBgkqhkiG9w0BAQsFAAOCAQEAoiuycWVVjmS9IMS1n9ll8UlIqq8dl7vs
-Y5ckGMrdSGR8BPgloTrB6ual4vRPgbn2rGBGAvGusdcmhc1vkVbYsI3JRpTTDDoE
-PvQqHWXwV2RDRU5kG6ZOsU+o01Ir4b3w3qfP2LT20FCuuAMIMh23PsSmoc7ziFZ8
-76+ox6FjhJMPMF2aftiDmP44/fFg16C1t2PFH/Bk4sm4qRdpXVcWeiaHaSF9JkHa
-XwW3TuDSxJwlFFU7ffTRgYYkQ61q8B0LjWV4FF1dBBqflAiXEhWcVhljqfsWn7rq
-NBJ/QzZ3GhgQO9GOCokh/ckcp/ZMOm9tv9lV2huGz8Akk8/UYhMUEg==
+cm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMMCUVzcHJlc3NpZjAeFw0yMDA2
+MTIwNjA0MTNaFw0yMjA2MDIwNjA0MTNaMBQxEjAQBgNVBAMMCWxvY2FsaG9zdDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVAssDYVb+ETtsvYf1ximdW
+s85N48x6UgcyBjvS6IgPLawv6dcpBmlH2DyZZWCuBzIQuH1MhNye7VS9hLJM5dui
+zTy2xKGgVmTPTYVd4gNf9RLTrqerpi8fst7A37yt+WADlG43QJQX4ZyeK/Ie6E7M
+ZdyeY2dfM4IyZyYtjRBav8k6TjIsBy1j48tuXwxYsX1fVM0r24LdSWhj5gu3OEJI
+R848qdPopLr0SMNKfQQTXqgVdnWt6gTAeRbaHVCUwM+qOjilm02pS40IugtR+s/U
+52OyKyQVDsvxVpEB/7BLC3bHA4R2tQ89qE9tN0I4c8jkn5zRfeQ/9THTXDLepdMC
+AwEAATANBgkqhkiG9w0BAQsFAAOCAQEAnMYGW+idt37bEE4WPgrRorKWuplR+zHD
+wJFz53DQzyIZJHmJ2hR5U0jNcHy/nMq7tbdz9LZPrVF4lZJ3TJhnmkOKjMFPCQE8
+YcmsP3il6eXgtGqg53InOi/uJqEQ9TfM54cbpp6xKbnmpwk4uprISBRQt7u2ZLk2
+40ED6zgjFPDTYmSjSpb2AN6KUB6PflgVs+4p9ViHNq4U3AlYV/BM0+3G4aMX2wNl
+ZIpQfOyuaYD5MU50mY+O+gDiiypkpYf6a6S4YJ1sMbavDsP7bW5UMnP0jKYR549q
+5hF1fdkXq52DfJ9ya2kl3mANFkKssQV+1KCBMxGoeqfakmJfa03xXA==
 -----END CERTIFICATE-----

components/asio/port/include/asio/detail/config.hpp

@@ -7,6 +7,5 @@
 
 #include "sys/socket.h"
 #include "socketpair.h"
-#include "asio_stub.hpp"
 
 #include_next "asio/detail/config.hpp"

components/asio/port/include/asio/ssl/mbedtls_specific.hpp

@@ -1,29 +0,0 @@
-//
-// SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
-//
-// SPDX-License-Identifier: BSL-1.0
-//
-
-#pragma once
-
-#include "asio/ssl/context_base.hpp"
-#include "asio/ssl/context.hpp"
-#include "asio/ssl/detail/openssl_types.hpp"
-
-namespace asio {
-namespace ssl {
-namespace mbedtls {
-
-/**
- * @brief Configures specific hostname to be used in peer verification
- *
- * @param handle asio::ssl context handle type
- * @param name hostname to be verified (std::string ownership will be moved to ssl::context)
- *
- * @return true on success
- */
-bool set_hostname(asio::ssl::context::native_handle_type handle, std::string name);
-
-};
-};
-} // namespace asio::ssl::mbedtls

components/asio/port/include/asio_stub.hpp

@@ -1,9 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#pragma once
-#include <signal.h>
-
-extern "C" int pthread_sigmask(int, const sigset_t *, sigset_t *);

components/asio/port/mbedtls/include/mbedtls_context.hpp

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //
@@ -52,12 +52,6 @@ public:
         return nullptr;
     }
 
-    bool set_hostname(std::string hostname)
-    {
-        hostname_ = std::move(hostname);
-        return true;
-    }
-
     std::size_t size(container c) const
     {
         switch (c) {
@@ -76,7 +70,6 @@ public:
     const_buffer cert_chain_;
     const_buffer private_key_;
     const_buffer ca_cert_;
-    std::string hostname_;
 };
 
 /**

components/asio/port/mbedtls/include/mbedtls_engine.hpp

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021-2025 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //
@@ -16,11 +16,6 @@ namespace asio {
 namespace ssl {
 namespace mbedtls {
 
-bool set_hostname(asio::ssl::context::native_handle_type handle, std::string name)
-{
-    return handle->get()->set_hostname(std::move(name));
-}
-
 const char *error_message(int error_code)
 {
     static char error_buf[100];
@@ -30,7 +25,7 @@ const char *error_message(int error_code)
 
 void throw_alloc_failure(const char *location)
 {
-    asio::error_code ec(MBEDTLS_ERR_SSL_ALLOC_FAILED, asio::error::get_mbedtls_category());
+    asio::error_code ec( MBEDTLS_ERR_SSL_ALLOC_FAILED, asio::error::get_mbedtls_category());
     asio::detail::throw_error(ec, location);
 }
 
@@ -274,16 +269,6 @@ private:
             } else {
                 mbedtls_ssl_conf_ca_chain(&conf_, nullptr, nullptr);
             }
-
-            // Configure hostname before handshake if users pre-configured any
-            // use NULL if not set (to preserve the default behaviour of mbedtls < v3.6.3)
-            const char* hostname = !ctx->hostname_.empty() ? ctx->hostname_.c_str() : NULL;
-            ret = mbedtls_ssl_set_hostname(&ssl_, hostname);
-            if (ret < 0) {
-                print_error("mbedtls_ssl_set_hostname", ret);
-                return false;
-            }
-
             ret = mbedtls_ssl_setup(&ssl_, &conf_);
             if (ret) {
                 print_error("mbedtls_ssl_setup", ret);

components/asio/port/src/asio_stub.cpp

@@ -28,7 +28,7 @@ posix_event::posix_event()
 }
 } // namespace asio::detail
 
-extern "C" int pause(void)
+extern "C" int pause (void)
 {
     while (true) {
         ::sleep(UINT_MAX);

components/console_cmd_ifconfig/idf_component.yml

@@ -9,8 +9,4 @@ dependencies:
     override_path: '../console_simple_init'
     public: true
   espressif/ethernet_init:
-    matches:
-    - if: idf_version >=6.0
-      version: ^1.0.0
-    - if: idf_version <6.0
-      version: '==0.3.0'
+    version: '>=0.0.7'

components/console_cmd_mqtt/idf_component.yml

@@ -9,7 +9,3 @@ dependencies:
     version: '>=1.1.0'
     override_path: '../console_simple_init'
     public: true
-  espressif/mqtt:
-    rules:
-    - if: idf_version >=6.0
-      version: ^1.0.0

components/console_cmd_ping/.cz.yaml

@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(console): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py console_cmd_ping
   tag_format: console_cmd_ping-v$version
-  version: 1.2.0
+  version: 1.1.0
   version_files:
   - idf_component.yml

components/console_cmd_ping/CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## [1.2.0](https://github.com/espressif/esp-protocols/commits/console_cmd_ping-v1.2.0)
-
-### Features
-
-- Add support for interface argument ([90ddb04e](https://github.com/espressif/esp-protocols/commit/90ddb04e))
-
 ## [1.1.0](https://github.com/espressif/esp-protocols/commits/console_cmd_ping-v1.1.0)
 
 ### Features

components/console_cmd_ping/README.md

@@ -48,7 +48,7 @@ For more details refer [IDF Component Manager](https://docs.espressif.com/projec
 
 ### ping:
 ```
-ping  [-W <t>] [-i <t>] [-s <n>] [-c <n>] [-Q <n>] [-T <n>] [-I <n>] <host>
+ping  [-W <t>] [-i <t>] [-s <n>] [-c <n>] [-Q <n>] [-T <n>] <host>
   send ICMP ECHO_REQUEST to network hosts
   -W, --timeout=<t>  Time to wait for a response, in seconds
   -i, --interval=<t>  Wait interval seconds between sending each packet
@@ -56,7 +56,6 @@ ping  [-W <t>] [-i <t>] [-s <n>] [-c <n>] [-Q <n>] [-T <n>] [-I <n>] <host>
   -c, --count=<n>  Stop after sending count packets
   -Q, --tos=<n>  Set Type of Service related bits in IP datagrams
   -T, --ttl=<n>  Set Time to Live related bits in IP datagrams
-  -I, --interface=<n>  Set Interface number 0=no-interface selected, >0 netif number + 1 (1 is usually 'lo0')
         <host>  Host address
 
 getaddrinfo  [-f <AF>] [-F <FLAGS>]... [-p <port>] <hostname>
@@ -122,8 +121,8 @@ getaddrinfo -f AF_INET -F AI_PASSIVE www.example.com
 ping www.example.com
 ```
 
-2. To specify additional options, such as timeout, interval, packet size, interface, etc.:
+2. To specify additional options, such as timeout, interval, packet size, etc.:
 
 ```
-ping -W 5 -i 1 -s 64 -c 4 -Q 0x10 -T 64 -I 0 www.example.com
+ping -W 5 -i 1 -s 64 -c 4 -Q 0x10 -T 64 www.example.com
 ```

components/console_cmd_ping/console_ping.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -99,7 +99,6 @@ static struct {
     struct arg_int *count;
     struct arg_int *tos;
     struct arg_int *ttl;
-    struct arg_int *interface;
     struct arg_str *host;
     struct arg_end *end;
 } ping_args;
@@ -138,10 +137,6 @@ static int do_ping_cmd(int argc, char **argv)
         config.ttl = (uint32_t)(ping_args.ttl->ival[0]);
     }
 
-    if (ping_args.interface->count > 0) {
-        config.interface = (uint32_t)(ping_args.interface->ival[0]);
-    }
-
     // parse IP address
     struct sockaddr_in6 sock_addr6;
     ip_addr_t target_addr = {0};
@@ -160,12 +155,12 @@ static int do_ping_cmd(int argc, char **argv)
         }
         if (res->ai_family == AF_INET) {
 #if CONFIG_LWIP_IPV4
-            struct in_addr addr4 = ((struct sockaddr_in *)(res->ai_addr))->sin_addr;
+            struct in_addr addr4 = ((struct sockaddr_in *) (res->ai_addr))->sin_addr;
             inet_addr_to_ip4addr(ip_2_ip4(&target_addr), &addr4);
 #endif
         } else {
 #if CONFIG_LWIP_IPV6
-            struct in6_addr addr6 = ((struct sockaddr_in6 *)(res->ai_addr))->sin6_addr;
+            struct in6_addr addr6 = ((struct sockaddr_in6 *) (res->ai_addr))->sin6_addr;
             inet6_addr_to_ip6addr(ip_2_ip6(&target_addr), &addr6);
 #endif
         }
@@ -209,7 +204,6 @@ esp_err_t console_cmd_ping_register(void)
     ping_args.count = arg_int0("c", "count", "<n>", "Stop after sending count packets");
     ping_args.tos = arg_int0("Q", "tos", "<n>", "Set Type of Service related bits in IP datagrams");
     ping_args.ttl = arg_int0("T", "ttl", "<n>", "Set Time to Live related bits in IP datagrams");
-    ping_args.interface = arg_int0("I", "interface", "<n>", "Set Interface number");
     ping_args.host = arg_str1(NULL, NULL, "<host>", "Host address");
     ping_args.end = arg_end(1);
     const esp_console_cmd_t ping_cmd = {

components/console_cmd_ping/idf_component.yml

@@ -1,4 +1,4 @@
-version: 1.2.0
+version: 1.1.0
 url: https://github.com/espressif/esp-protocols/tree/master/components/console_cmd_ping
 description: The component provides a console where the 'ping' command can be executed.
 dependencies:

components/eppp_link/.cz.yaml

@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(eppp): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py eppp_link
   tag_format: eppp-v$version
-  version: 1.1.4
+  version: 0.2.0
   version_files:
   - idf_component.yml

components/eppp_link/CHANGELOG.md

@@ -1,72 +1,5 @@
 # Changelog
 
-## [1.1.4](https://github.com/espressif/esp-protocols/commits/eppp-v1.1.4)
-
-### Bug Fixes
-
-- Fixed missing freertos deps ([f1e35977](https://github.com/espressif/esp-protocols/commit/f1e35977))
-- Add optional mqtt dependency ([911c2dbe](https://github.com/espressif/esp-protocols/commit/911c2dbe))
-
-## [1.1.3](https://github.com/espressif/esp-protocols/commits/eppp-v1.1.3)
-
-### Bug Fixes
-
-- Fix test dependency issue on driver ([1ace92c2](https://github.com/espressif/esp-protocols/commit/1ace92c2))
-- Fix tun netif to (optionally) return errors ([7a6cf0f9](https://github.com/espressif/esp-protocols/commit/7a6cf0f9))
-
-## [1.1.2](https://github.com/espressif/esp-protocols/commits/eppp-v1.1.2)
-
-### Bug Fixes
-
-- Update uart driver deps per IDF > v5.3 ([92e14607](https://github.com/espressif/esp-protocols/commit/92e14607))
-
-## [1.1.1](https://github.com/espressif/esp-protocols/commits/eppp-v1.1.1)
-
-### Bug Fixes
-
-- Fix getting context for channel API ([94563cdc](https://github.com/espressif/esp-protocols/commit/94563cdc))
-- Cover more combinations in build tests ([e0b8de8f](https://github.com/espressif/esp-protocols/commit/e0b8de8f))
-
-## [1.1.0](https://github.com/espressif/esp-protocols/commits/eppp-v1.1.0)
-
-### Features
-
-- Add support for UART flow control ([cd57f1bb](https://github.com/espressif/esp-protocols/commit/cd57f1bb), [#870](https://github.com/espressif/esp-protocols/issues/870))
-
-### Bug Fixes
-
-- Fix SPI transport to allow already init GPIO ISR ([497ee2d6](https://github.com/espressif/esp-protocols/commit/497ee2d6), [#868](https://github.com/espressif/esp-protocols/issues/868))
-- Fix stack-overflow in ping task for TUN netif ([b2568a3d](https://github.com/espressif/esp-protocols/commit/b2568a3d), [#867](https://github.com/espressif/esp-protocols/issues/867))
-
-### Updated
-
-- ci(common): Update test component dir for IDFv6.0 ([18418c83](https://github.com/espressif/esp-protocols/commit/18418c83))
-
-## [1.0.1](https://github.com/espressif/esp-protocols/commits/eppp-v1.0.1)
-
-### Bug Fixes
-
-- Support for IPv4-only mode ([653328ba](https://github.com/espressif/esp-protocols/commit/653328ba), [#864](https://github.com/espressif/esp-protocols/issues/864))
-
-## [1.0.0](https://github.com/espressif/esp-protocols/commits/eppp-v1.0.0)
-
-### Features
-
-- Add support for custom channels ([4ee9360f](https://github.com/espressif/esp-protocols/commit/4ee9360f))
-
-## [0.3.1](https://github.com/espressif/esp-protocols/commits/eppp-v0.3.1)
-
-### Bug Fixes
-
-- Fix NETIF_PPP_STATUS link issue if PPP disabled in lwip ([077ea0bb](https://github.com/espressif/esp-protocols/commit/077ea0bb))
-
-## [0.3.0](https://github.com/espressif/esp-protocols/commits/eppp-v0.3.0)
-
-### Features
-
-- Add support for TUN interface ([2ff150c3](https://github.com/espressif/esp-protocols/commit/2ff150c3))
-- Add support for transport via Ethernet link ([a21ce883](https://github.com/espressif/esp-protocols/commit/a21ce883))
-
 ## [0.2.0](https://github.com/espressif/esp-protocols/commits/eppp-v0.2.0)
 
 ### Features

components/eppp_link/CMakeLists.txt

@@ -1,33 +1,3 @@
-if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER "5.3")
-    set(driver_deps esp_driver_gpio esp_driver_spi esp_driver_uart esp_driver_sdio)
-else()
-    set(driver_deps driver)
-endif()
-
-if(CONFIG_EPPP_LINK_DEVICE_ETH)
-    set(transport_src eppp_eth.c)
-endif()
-
-if(CONFIG_EPPP_LINK_DEVICE_SPI)
-    set(transport_src eppp_spi.c)
-endif()
-
-if(CONFIG_EPPP_LINK_DEVICE_UART)
-    set(transport_src eppp_uart.c)
-endif()
-
-if(CONFIG_EPPP_LINK_DEVICE_SDIO)
-    set(transport_src eppp_sdio.c eppp_sdio_slave.c eppp_sdio_host.c)
-endif()
-
-if(NOT CONFIG_EPPP_LINK_USES_PPP)
-    set(netif_src eppp_netif_tun.c)
-endif()
-
-idf_component_register(SRCS eppp_link.c ${transport_src} ${netif_src}
+idf_component_register(SRCS eppp_link.c eppp_sdio_slave.c eppp_sdio_host.c
                     INCLUDE_DIRS "include"
-                    PRIV_REQUIRES esp_netif esp_timer esp_eth ${driver_deps})
-
-if(CONFIG_EPPP_LINK_DEVICE_ETH)
-    idf_component_optional_requires(PRIVATE ethernet_init espressif__ethernet_init)
-endif()
+                    PRIV_REQUIRES esp_netif esp_driver_spi esp_driver_gpio esp_timer driver)

components/eppp_link/Kconfig

@@ -1,16 +1,10 @@
 menu "eppp_link"
 
-    config EPPP_LINK_USES_PPP
-        bool "Use PPP network interface"
-        default "n"
+    config EPPP_LINK_USES_LWIP
+        bool
+        default "y"
         select LWIP_PPP_SUPPORT
         select LWIP_PPP_SERVER_SUPPORT
-        help
-            Enable this option to use PPP network interface.
-            This is useful when pairing with another PPP device,
-            e.g. pppd service on Linux.
-            By default EPPP_LINK uses plain TUN interface,
-            relying on transports to split on packet boundaries.
 
     choice EPPP_LINK_DEVICE
         prompt "Choose PPP device"
@@ -34,16 +28,6 @@ menu "eppp_link"
             help
                 Use SDIO.
 
-        config EPPP_LINK_DEVICE_ETH
-            bool "Ethernet"
-            depends on SOC_EMAC_SUPPORTED
-            help
-                Use Ethernet.
-                This transport could employ a full fledged Ethernet connection
-                between two EPPP nodes via standard Ethernet cable.
-                It could be also effectively connected directly on PCB, EMAC to EMAC,
-                without any Ethernet PHY chips (using eth_dummy_phy driver).
-
     endchoice
 
     config EPPP_LINK_CONN_MAX_RETRY
@@ -83,31 +67,4 @@ menu "eppp_link"
 
     endchoice
 
-    config EPPP_LINK_ETHERNET_OUR_ADDRESS
-        string "MAC address our local node"
-        default "06:00:00:00:00:01"
-        depends on EPPP_LINK_DEVICE_ETH
-
-    config EPPP_LINK_ETHERNET_THEIR_ADDRESS
-        string "MAC address the remote node"
-        default "06:00:00:00:00:02"
-        depends on EPPP_LINK_DEVICE_ETH
-
-    config EPPP_LINK_CHANNELS_SUPPORT
-        bool "Enable channel support (multiple logical channels)"
-        default n
-        depends on !EPPP_LINK_DEVICE_ETH
-        help
-            Enable support for multiple logical channels in the EPPP link layer.
-            When enabled, you can configure the number of channels used for communication.
-
-    config EPPP_LINK_NR_OF_CHANNELS
-        int "Number of logical channels"
-        depends on EPPP_LINK_CHANNELS_SUPPORT && !EPPP_LINK_DEVICE_ETH
-        range 1 8
-        default 2
-        help
-            Set the number of logical channels for EPPP link communication.
-            Each channel can be used for independent data streams.
-
 endmenu

components/eppp_link/README.md

@@ -1,74 +1,24 @@
 # ESP PPP Link component (eppp_link)
 
-The component provides a general purpose connectivity engine between two microcontrollers, one acting as PPP server, the other one as PPP client.
-This component could be used for extending network using physical serial connection. Applications could vary from providing RPC engine for multiprocessor solutions to serial connection to POSIX machine. This uses a standard PPP protocol (if enabled) to negotiate IP addresses and networking, so standard PPP toolset could be used, e.g. a `pppd` service on linux. Typical application is a WiFi connectivity provider for chips that do not have WiFi.
-Uses simplified TUN network interface by default to enable faster data transfer on non-UART transports.
+The component provides a general purpose connectivity engine between two microcontrollers, one acting as PPP server (slave), the other one as PPP client (host).
+This component could be used for extending network using physical serial connection. Applications could vary from providing PRC engine for multiprocessor solutions to serial connection to POSIX machine. This uses a standard PPP protocol to negotiate IP addresses and networking, so standard PPP toolset could be used, e.g. a `pppd` service on linux. Typical application is a WiFi connectivity provider for chips that do not have WiFi
 
 ## Typical application
 
 Using this component we can construct a WiFi connectivity gateway on PPP channel. The below diagram depicts an application where
 PPP server is running on a WiFi capable chip with NAPT module translating packets between WiFi and PPPoS interface.
-We usually call this node a communication coprocessor, or a "SLAVE" microcontroller.
-The main microcontroller (sometimes also called the "HOST") runs PPP client and connects only to the serial line,
-brings in the WiFi connectivity from the communication coprocessor.
+We usually call this node a SLAVE microcontroller. The "HOST" microcontroller runs PPP client and connects only to the serial line,
+brings in the WiFi connectivity from the "SLAVE" microcontroller.
 
 ```
-        Communication coprocessor                        Main microcontroller
-    \|/  +----------------+                               +----------------+
-     |   |                |       (serial) line           |                |
-     +---+ WiFi NAT PPPoS |=== UART / SPI / SDIO / ETH ===| PPPoS client   |
-         |        (server)|                               |                |
-         +----------------+                               +----------------+
+             SLAVE micro                                  HOST micro
+    \|/  +----------------+                           +----------------+
+     |   |                |          serial line      |                |
+     +---+ WiFi NAT PPPoS |=== UART / SPI / SDIO =====| PPPoS client   |
+         |        (server)|                           |                |
+         +----------------+                           +----------------+
 ```
 
-## Features
-
-### Network Interface Modes
-
-Standard PPP Mode (where PPP protocols is preferred) or simple tunnel using TUN Mode.
-
-### Transport layer
-
-UART, SPI, SDIO, Ethernet
-
-### Support for logical channels
-
-Allows channeling custom data (e.g. 802.11 frames)
-
-## (Other) usecases
-
-Besides the communication coprocessor example mentioned above, this component could be used to:
-* Bring Wi-Fi connectivity to a computer using ESP32 chip.
-* Connect your microcontroller to the internet via a pppd server (running on a raspberry)
-* Bridging two networks with two microcontrollers
-
-## Configuration
-
-### Choose the transport layer
-
-Use `idf.py menuconfig` to select the transport layer:
-
-* `CONFIG_EPPP_LINK_UART` -- Use UART transport layer
-* `CONFIG_EPPP_LINK_SPI` -- Use SPI transport layer
-* `CONFIG_EPPP_LINK_SDIO` -- Use SDIO transport layer
-* `CONFIG_EPPP_LINK_ETHERNET` -- Use Ethernet transport
-  - Note: Ethernet creates it's own task, so calling `eppp_perform()` would not work
-  - Note: Add dependency to ethernet_init component to use other Ethernet drivers
-  - Note: You can override functions `eppp_transport_ethernet_deinit()` and `eppp_transport_ethernet_init()` to use your own Ethernet driver
-
-### Choose the network interface
-
-Use PPP netif for UART; Keep the default (TUN) for others
-
-### Channel support (multiple logical channels)
-
-* `CONFIG_EPPP_LINK_CHANNELS_SUPPORT` -- Enable support for multiple logical channels (default: disabled)
-* `CONFIG_EPPP_LINK_NR_OF_CHANNELS` -- Number of logical channels (default: 2, range: 1-8, only visible if channel support is enabled)
-
-When channel support is enabled, the EPPP link can multiplex multiple logical data streams over the same transport. The number of channels is configurable. Channel support is not available for Ethernet transport.
-
-To use channels in your application, use the `eppp_add_channels()` API and provide your own channel transmit/receive callbacks. These APIs and related types are only available when channel support is enabled in Kconfig.
-
 ## API
 
 ### Client
@@ -86,9 +36,6 @@ To use channels in your application, use the `eppp_add_channels()` API and provi
 * `eppp_netif_start()` -- Starts the network, could be called after startup or whenever a connection is lost
 * `eppp_netif_stop()` --  Stops the network
 * `eppp_perform()` -- Perform one iteration of the PPP task (need to be called regularly in task-less configuration)
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-* `eppp_add_channels()` -- Register channel transmit/receive callbacks (only available if channel support is enabled)
-#endif
 
 ## Throughput
 
@@ -108,9 +55,3 @@ Tested with WiFi-NAPT example
 
 * TCP - 9Mbits/s
 * UDP - 11Mbits/s
-
-### Ethernet
-
-- Internal EMAC with real PHY chip
-    * TCP - 5Mbits/s
-    * UDP - 8Mbits/s

components/eppp_link/detailed_description.md

@@ -1,370 +0,0 @@
-# ESP PPP Link Component (eppp_link) - Detailed Documentation
-
-## Overview
-
-The ESP PPP Link component provides a versatile communication bridge between two ESP32 microcontrollers, enabling network connectivity over various physical transport layers. One device acts as a server (typically providing connectivity), while the other acts as a client (consuming connectivity).
-
-## Network Interface Modes
-
-### PPP Mode vs TUN Mode
-
-The component supports two distinct network interface modes:
-
-#### PPP Mode (`CONFIG_EPPP_LINK_USES_PPP=y`)
-- **Standard PPP Protocol**: Uses the Point-to-Point Protocol (RFC 1661) with full LCP negotiation
-- **Compatibility**: Compatible with standard PPP implementations like Linux `pppd`
-- **Features**:
-  - Automatic IP address negotiation
-  - Link Control Protocol (LCP) for connection establishment
-  - Authentication support (if configured)
-  - Standard PPP framing with escape sequences
-- **Use Case**: When interfacing with standard PPP-capable systems or when full PPP compatibility is required
-- **Transport Limitation**: Primarily designed for UART transport due to PPP's serial nature
-
-#### TUN Mode (`CONFIG_EPPP_LINK_USES_PPP=n`, default)
-- **Simplified Packet Interface**: Uses a custom packet-based protocol without PPP negotiation
-- **Performance**: Faster data transfer due to reduced protocol overhead
-- **Features**:
-  - Direct IP packet transmission
-  - Custom framing for packet boundaries
-  - No negotiation overhead
-  - Static IP address configuration
-- **Use Case**: Default mode for ESP-to-ESP communication, optimal for non-UART transports
-- **Transport Support**: Works efficiently with all transport types (UART, SPI, SDIO, Ethernet)
-
-**Mode Selection**: Configure via `idf.py menuconfig` → `Component config` → `eppp_link` → `Use PPP network interface`
-
-## Transport Layer Options
-
-### UART Transport
-- **Configuration**: `CONFIG_EPPP_LINK_DEVICE_UART=y`
-- **Features**:
-  - Simple serial communication
-  - Configurable baud rate (up to 3Mbps tested)
-  - Hardware flow control support
-  - Custom framing for packet boundaries in TUN mode
-- **Performance**: ~2 Mbps (TCP/UDP) @ 3 Mbaud
-- **Use Case**: Basic connectivity, long-distance communication, debugging
-- **Pins**: TX, RX configurable
-
-```c
-eppp_config_t config = EPPP_DEFAULT_CLIENT_CONFIG();
-config.transport = EPPP_TRANSPORT_UART;
-config.uart.tx_io = 25;
-config.uart.rx_io = 26;
-config.uart.baud = 921600;
-```
-
-### SPI Transport
-- **Configuration**: `CONFIG_EPPP_LINK_DEVICE_SPI=y`
-- **Features**:
-  - Master/slave configuration
-  - GPIO interrupt signaling for flow control
-  - Configurable clock frequency
-  - Full-duplex communication
-  - Packet queue for transmission
-- **Performance**: ~5 Mbps (TCP), ~8 Mbps (UDP) @ 16MHz
-- **Use Case**: High-speed local communication, PCB-level connections
-- **Pins**: MOSI, MISO, SCLK, CS, interrupt GPIO
-
-```c
-eppp_config_t config = EPPP_DEFAULT_CLIENT_CONFIG();
-config.transport = EPPP_TRANSPORT_SPI;
-config.spi.is_master = true;
-config.spi.freq = 16000000;
-config.spi.mosi = 11;
-config.spi.miso = 13;
-config.spi.sclk = 12;
-config.spi.cs = 10;
-config.spi.intr = 2;
-```
-
-### SDIO Transport
-- **Configuration**: `CONFIG_EPPP_LINK_DEVICE_SDIO=y`
-- **Features**:
-  - Host/slave configuration
-  - High-speed data transfer
-  - 1-bit or 4-bit bus width
-  - Hardware flow control
-- **Performance**: ~9 Mbps (TCP), ~11 Mbps (UDP)
-- **Use Case**: Highest throughput applications, module-to-module communication
-- **Pins**: CLK, CMD, D0-D3 (configurable width)
-
-```c
-eppp_config_t config = EPPP_DEFAULT_CLIENT_CONFIG();
-config.transport = EPPP_TRANSPORT_SDIO;
-config.sdio.is_host = true;
-config.sdio.width = 4;
-config.sdio.clk = 18;
-config.sdio.cmd = 19;
-config.sdio.d0 = 14;
-// ... additional data pins
-```
-
-### Ethernet Transport
-- **Configuration**: `CONFIG_EPPP_LINK_DEVICE_ETH=y`
-- **Features**:
-  - Direct MAC-to-MAC communication
-  - Can work with or without PHY chips
-  - Standard Ethernet framing
-  - Automatic task management (no `eppp_perform()` needed)
-- **Performance**: ~5 Mbps (TCP), ~8 Mbps (UDP) with internal EMAC
-- **Use Case**: Board-to-board communication, integration with existing Ethernet infrastructure
-- **Pins**: MDC, MDIO, plus PHY-specific pins
-
-```c
-eppp_config_t config = EPPP_DEFAULT_CLIENT_CONFIG();
-config.transport = EPPP_TRANSPORT_ETHERNET;
-config.ethernet.mdc_io = 23;
-config.ethernet.mdio_io = 18;
-config.ethernet.phy_addr = 1;
-config.ethernet.rst_io = 5;
-```
-
-## Channel Support (Multiple Logical Channels)
-
-### Overview
-Channel support allows multiplexing multiple independent data streams over a single transport connection. This enables applications to separate different types of data (e.g., network traffic, control commands, sensor data) into distinct logical channels.
-
-### Configuration
-- **Enable**: `CONFIG_EPPP_LINK_CHANNELS_SUPPORT=y`
-- **Count**: `CONFIG_EPPP_LINK_NR_OF_CHANNELS` (1-8 channels, default 2)
-- **Limitation**: Not available for Ethernet transport
-
-### Channel Usage
-```c
-// Channel callback function type
-typedef esp_err_t (*eppp_channel_fn_t)(esp_netif_t *netif, int nr, void *buffer, size_t len);
-
-// Register channel callbacks
-esp_err_t eppp_add_channels(esp_netif_t *netif,
-                           eppp_channel_fn_t *tx,     // Transmit function pointer (output)
-                           const eppp_channel_fn_t rx, // Receive callback (input)
-                           void* context);             // User context
-
-// Get user context
-void* eppp_get_context(esp_netif_t *netif);
-```
-
-### Channel Example
-```c
-// Channel 0: Default network traffic (handled automatically)
-// Channel 1: Control/chat messages
-// Channel 2: WiFi data forwarding
-
-static esp_err_t channel_receive(esp_netif_t *netif, int channel, void *buffer, size_t len)
-{
-    switch(channel) {
-        case 1: // Control channel
-            process_control_message(buffer, len);
-            break;
-        case 2: // WiFi channel
-            forward_to_wifi(buffer, len);
-            break;
-        default:
-            ESP_LOGE(TAG, "Unknown channel %d", channel);
-            return ESP_FAIL;
-    }
-    return ESP_OK;
-}
-
-// Register channels
-eppp_channel_fn_t tx_func;
-eppp_add_channels(netif, &tx_func, channel_receive, user_context);
-
-// Transmit on specific channel
-tx_func(netif, 1, "Hello", 5);  // Send to channel 1
-```
-
-## API Reference
-
-### Simple API (Recommended for most use cases)
-
-#### Client Side
-```c
-esp_netif_t *eppp_connect(eppp_config_t *config);
-```
-- **Purpose**: Simplified client connection
-- **Behavior**: Blocks until connection is established
-- **Returns**: Configured network interface or NULL on failure
-- **Use Case**: Simple applications that don't need fine-grained control
-
-#### Server Side
-```c
-esp_netif_t *eppp_listen(eppp_config_t *config);
-```
-- **Purpose**: Simplified server listening
-- **Behavior**: Blocks until client connects
-- **Returns**: Configured network interface or NULL on failure
-- **Use Case**: Simple applications that don't need fine-grained control
-
-#### Connection Management
-```c
-void eppp_close(esp_netif_t *netif);
-```
-- **Purpose**: Close connection and cleanup resources
-- **Behavior**: Stops tasks, closes transport, destroys network interface
-
-### Advanced API (Manual Control)
-
-#### Initialization
-```c
-esp_netif_t *eppp_init(eppp_type_t role, eppp_config_t *config);
-```
-- **Purpose**: Initialize endpoint without starting communication
-- **Parameters**:
-  - `role`: `EPPP_SERVER` or `EPPP_CLIENT`
-  - `config`: Transport and network configuration
-- **Returns**: Network interface handle
-- **Use Case**: Applications needing manual control over connection lifecycle
-
-#### Connection Control
-```c
-esp_err_t eppp_netif_start(esp_netif_t *netif);
-esp_err_t eppp_netif_stop(esp_netif_t *netif, int stop_timeout_ms);
-```
-- **Purpose**: Manual network interface start/stop
-- **Use Case**: Dynamic connection management, error recovery
-
-#### Task Management
-```c
-esp_err_t eppp_perform(esp_netif_t *netif);
-```
-- **Purpose**: Single iteration of communication task
-- **Returns**:
-  - `ESP_OK`: Continue operation
-  - `ESP_FAIL`: Operation failed but should continue
-  - `ESP_ERR_TIMEOUT`: Stop operation requested
-- **Use Case**: Task-less operation, integration with custom task schedulers
-- **Note**: Not needed for Ethernet transport (has its own task)
-
-#### Resource Management
-```c
-void eppp_deinit(esp_netif_t *netif);
-```
-- **Purpose**: Clean up resources without stopping tasks
-- **Use Case**: Manual resource management
-
-## Configuration Examples
-
-### Basic Client-Server Setup
-
-**Client (Host) Configuration:**
-```c
-void app_main(void)
-{
-    ESP_ERROR_CHECK(esp_netif_init());
-    ESP_ERROR_CHECK(esp_event_loop_create_default());
-
-    eppp_config_t config = EPPP_DEFAULT_CLIENT_CONFIG();
-    config.transport = EPPP_TRANSPORT_UART;
-    config.uart.tx_io = 25;
-    config.uart.rx_io = 26;
-    config.uart.baud = 921600;
-
-    esp_netif_t *netif = eppp_connect(&config);
-    if (netif == NULL) {
-        ESP_LOGE(TAG, "Failed to connect");
-        return;
-    }
-
-    ESP_LOGI(TAG, "Connected successfully");
-    // Use network interface for communication
-}
-```
-
-**Server (Slave) Configuration:**
-```c
-void app_main(void)
-{
-    ESP_ERROR_CHECK(esp_netif_init());
-    ESP_ERROR_CHECK(esp_event_loop_create_default());
-
-    // Initialize WiFi or other network interface
-    init_wifi();
-
-    eppp_config_t config = EPPP_DEFAULT_SERVER_CONFIG();
-    config.transport = EPPP_TRANSPORT_UART;
-    config.uart.tx_io = 26;  // Crossed with client
-    config.uart.rx_io = 25;  // Crossed with client
-    config.uart.baud = 921600;
-
-    esp_netif_t *netif = eppp_listen(&config);
-    if (netif == NULL) {
-        ESP_LOGE(TAG, "Failed to setup server");
-        return;
-    }
-
-    // Enable NAT to share WiFi connection
-    ESP_ERROR_CHECK(esp_netif_napt_enable(netif));
-    ESP_LOGI(TAG, "Server ready");
-}
-```
-
-### Advanced Manual Control
-```c
-void app_main(void)
-{
-    ESP_ERROR_CHECK(esp_netif_init());
-    ESP_ERROR_CHECK(esp_event_loop_create_default());
-
-    eppp_config_t config = EPPP_DEFAULT_CLIENT_CONFIG();
-    config.task.run_task = false;  // Disable automatic task
-
-    esp_netif_t *netif = eppp_init(EPPP_CLIENT, &config);
-    if (netif == NULL) {
-        ESP_LOGE(TAG, "Failed to initialize");
-        return;
-    }
-
-    // Start network interface
-    ESP_ERROR_CHECK(eppp_netif_start(netif));
-
-    // Custom task loop
-    while (true) {
-        esp_err_t ret = eppp_perform(netif);
-        if (ret == ESP_ERR_TIMEOUT) {
-            ESP_LOGI(TAG, "Operation stopped");
-            break;
-        } else if (ret != ESP_OK) {
-            ESP_LOGE(TAG, "Operation failed: %s", esp_err_to_name(ret));
-        }
-
-        // Add custom processing here
-        vTaskDelay(pdMS_TO_TICKS(1));
-    }
-
-    eppp_deinit(netif);
-}
-```
-
-### Multi-Channel Configuration
-```c
-typedef struct {
-    eppp_channel_fn_t tx_func;
-    esp_netif_t *netif;
-} channel_context_t;
-
-static esp_err_t channel_rx(esp_netif_t *netif, int channel, void *buffer, size_t len)
-{
-    ESP_LOGI(TAG, "Channel %d received %d bytes", channel, len);
-    // Process channel data based on channel number
-    return ESP_OK;
-}
-
-void setup_channels(void)
-{
-    eppp_config_t config = EPPP_DEFAULT_CLIENT_CONFIG();
-    esp_netif_t *netif = eppp_connect(&config);
-
-    channel_context_t *ctx = calloc(1, sizeof(channel_context_t));
-    ctx->netif = netif;
-
-    // Register channel callbacks
-    ESP_ERROR_CHECK(eppp_add_channels(netif, &ctx->tx_func, channel_rx, ctx));
-
-    // Send data on channel 1
-    const char *msg = "Hello on channel 1";
-    ctx->tx_func(netif, 1, (void*)msg, strlen(msg));
-}
-```

components/eppp_link/eppp_eth.c

@@ -1,210 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <string.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "esp_check.h"
-#include "esp_event.h"
-#include "esp_mac.h"
-#include "esp_idf_version.h"
-#include "eppp_link.h"
-#include "eppp_transport.h"
-#include "esp_eth_driver.h"
-#include "esp_eth_spec.h"
-#include "eppp_transport_eth.h"
-// Use Ethernet Init component if available
-// (otherwise use just simple init/deinit with generic MAC/PHY)
-#if __has_include("ethernet_init.h")
-#define USE_ETHERNET_INIT_COMPONENT
-#include "ethernet_init.h"
-#endif
-
-typedef struct header {
-    uint8_t dst[ETH_ADDR_LEN];
-    uint8_t src[ETH_ADDR_LEN];
-    uint16_t len;
-} __attribute__((packed)) header_t;
-
-static const char *TAG = "eppp_ethernet";
-static bool s_is_connected = false;
-static esp_eth_handle_t *s_eth_handles = NULL;
-static uint8_t s_their_mac[ETH_ADDR_LEN];
-static uint8_t s_our_mac[ETH_ADDR_LEN];
-
-#ifndef USE_ETHERNET_INIT_COMPONENT
-static esp_eth_handle_t s_handles[1] = { NULL };
-static esp_eth_mac_t *s_mac = NULL;
-static esp_eth_phy_t *s_phy = NULL;
-
-static void simple_deinit(esp_eth_handle_t *handle_array[])
-{
-    if (s_handles[0] != NULL) {
-        esp_eth_driver_uninstall(s_handles[0]);
-        s_handles[0] = NULL;
-    }
-    if (s_mac != NULL) {
-        s_mac->del(s_mac);
-        s_mac = NULL;
-    }
-    if (s_phy != NULL) {
-        s_phy->del(s_phy);
-        s_phy = NULL;
-    }
-}
-
-static esp_err_t simple_init(struct eppp_config_ethernet_s *config, esp_eth_handle_t *handle_array[])
-{
-    esp_err_t ret = ESP_OK;
-    eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();
-    eth_esp32_emac_config_t esp32_emac_config = ETH_ESP32_EMAC_DEFAULT_CONFIG();
-    esp32_emac_config.smi_gpio.mdc_num = config->mdc_io;
-    esp32_emac_config.smi_gpio.mdio_num = config->mdio_io;
-    s_mac = esp_eth_mac_new_esp32(&esp32_emac_config, &mac_config);
-    eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
-    phy_config.phy_addr = config->phy_addr;
-    phy_config.reset_gpio_num = config->rst_io;
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
-    s_phy = esp_eth_phy_new_generic(&phy_config);
-#else
-    s_phy = esp_eth_phy_new_ip101(&phy_config);
-#endif
-    esp_eth_config_t eth_config = ETH_DEFAULT_CONFIG(s_mac, s_phy);
-    ESP_GOTO_ON_ERROR(esp_eth_driver_install(&eth_config, &s_handles[0]), err, TAG, "Ethernet driver install failed");
-    *handle_array = s_handles;
-    return ESP_OK;
-err:
-    simple_deinit(handle_array);
-    return ret;
-}
-
-#endif // USE_ETHERNET_INIT_COMPONENT
-
-static void event_handler(void *arg, esp_event_base_t event_base,
-                          int32_t event_id, void *event_data)
-{
-    switch (event_id) {
-    case ETHERNET_EVENT_CONNECTED:
-        ESP_LOGI(TAG, "Ethernet Link Up");
-        s_is_connected = true;
-        break;
-    case ETHERNET_EVENT_DISCONNECTED:
-        ESP_LOGI(TAG, "Ethernet Link Down");
-        s_is_connected = false;
-        break;
-    case ETHERNET_EVENT_START:
-        ESP_LOGI(TAG, "Ethernet Started");
-        break;
-    case ETHERNET_EVENT_STOP:
-        ESP_LOGI(TAG, "Ethernet Stopped");
-        break;
-    default:
-        break;
-    }
-}
-
-static esp_err_t receive(esp_eth_handle_t h, uint8_t *buffer, uint32_t len, void *netif)
-{
-    header_t *head = (header_t *)buffer;
-    size_t packet_len = head->len;
-    if (len >= packet_len) {
-        esp_err_t ret = esp_netif_receive(netif, buffer + ETH_HEADER_LEN, packet_len, NULL);
-        free(buffer);
-        return ret;
-    }
-    return ESP_FAIL;
-}
-
-__attribute__((weak)) esp_err_t eppp_transport_ethernet_init(struct eppp_config_ethernet_s *config, esp_eth_handle_t *handle_array[])
-{
-#ifdef USE_ETHERNET_INIT_COMPONENT
-    uint8_t eth_port_cnt = 0;
-    ESP_RETURN_ON_ERROR(ethernet_init_all(handle_array, &eth_port_cnt), TAG, "Failed to init common eth drivers");
-    ESP_RETURN_ON_FALSE(eth_port_cnt == 1, ESP_ERR_INVALID_ARG, TAG, "multiple Ethernet devices detected, please init only one");
-    return ESP_OK;
-#else
-    return simple_init(config, handle_array);
-#endif
-}
-
-__attribute__((weak)) void eppp_transport_ethernet_deinit(esp_eth_handle_t *handle_array[])
-{
-#ifdef USE_ETHERNET_INIT_COMPONENT
-    ethernet_deinit_all(s_eth_handles);
-#else
-    simple_deinit(handle_array);
-#endif
-}
-
-esp_err_t eppp_transport_tx(void *h, void *buffer, size_t len)
-{
-    static uint8_t out_buffer[ETH_HEADER_LEN];
-    if (!s_is_connected) {
-        return ESP_FAIL;
-    }
-    // setup Ethernet header
-    header_t *head = (header_t *)out_buffer;
-    memcpy(head->dst, s_their_mac, ETH_ADDR_LEN);
-    memcpy(head->src, s_our_mac, ETH_ADDR_LEN);
-    head->len = len;
-    // support only payloads with len <=  ETH_MAX_PAYLOAD_LEN
-    if (len > ETH_MAX_PAYLOAD_LEN) {
-        return ESP_FAIL;
-    }
-    return esp_eth_transmit_vargs(s_eth_handles[0], 2, out_buffer, ETH_HEADER_LEN, buffer, len);
-}
-
-static esp_err_t start_driver(esp_netif_t *esp_netif)
-{
-    ESP_RETURN_ON_ERROR(esp_eth_update_input_path(s_eth_handles[0], receive, esp_netif), TAG, "Failed to set Ethernet Rx callback");
-    sscanf(CONFIG_EPPP_LINK_ETHERNET_OUR_ADDRESS, "%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8,
-           &s_our_mac[0], &s_our_mac[1], &s_our_mac[2], &s_our_mac[3], &s_our_mac[4], &s_our_mac[5]);
-
-    sscanf(CONFIG_EPPP_LINK_ETHERNET_THEIR_ADDRESS, "%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8,
-           &s_their_mac[0], &s_their_mac[1], &s_their_mac[2], &s_their_mac[3], &s_their_mac[4], &s_their_mac[5]);
-    esp_eth_ioctl(s_eth_handles[0], ETH_CMD_S_MAC_ADDR, s_our_mac);
-    ESP_RETURN_ON_ERROR(esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, event_handler, NULL), TAG, "Failed to register Ethernet handlers");
-    ESP_RETURN_ON_ERROR(esp_eth_start(s_eth_handles[0]), TAG, "Failed to start Ethernet driver");
-    return ESP_OK;
-}
-
-static esp_err_t post_attach(esp_netif_t *esp_netif, void *args)
-{
-    eppp_transport_handle_t h = (eppp_transport_handle_t)args;
-    ESP_RETURN_ON_FALSE(h, ESP_ERR_INVALID_ARG, TAG, "Transport handle cannot be null");
-    h->base.netif = esp_netif;
-
-    esp_netif_driver_ifconfig_t driver_ifconfig = {
-        .handle =  h,
-        .transmit = eppp_transport_tx,
-    };
-
-    ESP_RETURN_ON_ERROR(esp_netif_set_driver_config(esp_netif, &driver_ifconfig), TAG, "Failed to set driver config");
-    ESP_LOGI(TAG, "EPPP Ethernet transport attached to EPPP netif %s", esp_netif_get_desc(esp_netif));
-    ESP_RETURN_ON_ERROR(start_driver(esp_netif), TAG, "Failed to start EPPP ethernet driver");
-    ESP_LOGI(TAG, "EPPP Ethernet driver started");
-    return ESP_OK;
-}
-
-eppp_transport_handle_t eppp_eth_init(struct eppp_config_ethernet_s *config)
-{
-    __attribute__((unused)) esp_err_t ret = ESP_OK;
-    ESP_RETURN_ON_FALSE(config, NULL, TAG, "Config cannot be null");
-    eppp_transport_handle_t h = calloc(1, sizeof(struct eppp_handle));
-    ESP_RETURN_ON_FALSE(h, NULL, TAG, "Failed to allocate eppp_handle");
-    ESP_GOTO_ON_ERROR(eppp_transport_ethernet_init(config, &s_eth_handles), err, TAG, "Failed to init Ethernet transport");
-    h->base.post_attach = post_attach;
-    return h;
-err:
-    return NULL;
-}
-
-void eppp_eth_deinit(eppp_transport_handle_t h)
-{
-    esp_eth_stop(s_eth_handles[0]);
-    eppp_transport_ethernet_deinit(&s_eth_handles);
-}

components/eppp_link/eppp_link.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2019-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,17 +12,16 @@
 #include "esp_event.h"
 #include "esp_netif_ppp.h"
 #include "eppp_link.h"
-#include "eppp_transport_eth.h"
-#include "eppp_transport_spi.h"
-#include "eppp_transport_uart.h"
-#include "eppp_transport_sdio.h"
-#include "eppp_transport.h"
+#include "esp_serial_slave_link/essl_sdio.h"
 
-
-#if CONFIG_EPPP_LINK_DEVICE_ETH
-#define EPPP_NEEDS_TASK 0
-#else
-#define EPPP_NEEDS_TASK 1
+#if CONFIG_EPPP_LINK_DEVICE_SPI
+#include "driver/spi_master.h"
+#include "driver/spi_slave.h"
+#include "driver/gpio.h"
+#include "esp_timer.h"
+#include "esp_rom_crc.h"
+#elif CONFIG_EPPP_LINK_DEVICE_UART
+#include "driver/uart.h"
 #endif
 
 static const int GOT_IPV4 = BIT0;
@@ -34,54 +33,204 @@ static const char *TAG = "eppp_link";
 static int s_retry_num = 0;
 static int s_eppp_netif_count = 0; // used as a suffix for the netif key
 
-void eppp_netif_deinit(esp_netif_t *netif)
+
+struct packet {
+    size_t len;
+    uint8_t *data;
+};
+
+#if CONFIG_EPPP_LINK_DEVICE_SPI
+#define MAX_PAYLOAD 1500
+#define MIN_TRIGGER_US 20
+#define SPI_HEADER_MAGIC 0x1234
+
+static void timer_callback(void *arg);
+
+struct header {
+    uint16_t magic;
+    uint16_t size;
+    uint16_t next_size;
+    uint16_t check;
+} __attribute__((packed));
+
+enum blocked_status {
+    NONE,
+    MASTER_BLOCKED,
+    MASTER_WANTS_READ,
+    SLAVE_BLOCKED,
+    SLAVE_WANTS_WRITE,
+};
+
+#endif // CONFIG_EPPP_LINK_DEVICE_SPI
+
+struct eppp_handle {
+#if CONFIG_EPPP_LINK_DEVICE_SPI
+    QueueHandle_t out_queue;
+    QueueHandle_t ready_semaphore;
+    spi_device_handle_t spi_device;
+    spi_host_device_t spi_host;
+    int gpio_intr;
+    uint16_t next_size;
+    uint16_t transaction_size;
+    struct packet outbound;
+    enum blocked_status blocked;
+    uint32_t slave_last_edge;
+    esp_timer_handle_t timer;
+#elif CONFIG_EPPP_LINK_DEVICE_UART
+    QueueHandle_t uart_event_queue;
+    uart_port_t uart_port;
+#endif
+    esp_netif_t *netif;
+    eppp_type_t role;
+    bool stop;
+    bool exited;
+    bool netif_stop;
+};
+
+typedef esp_err_t (*transmit_t)(void *h, void *buffer, size_t len);
+
+#if CONFIG_EPPP_LINK_DEVICE_SDIO
+esp_err_t eppp_sdio_host_tx(void *h, void *buffer, size_t len);
+esp_err_t eppp_sdio_host_rx(esp_netif_t *netif);
+esp_err_t eppp_sdio_slave_rx(esp_netif_t *netif);
+esp_err_t eppp_sdio_slave_tx(void *h, void *buffer, size_t len);
+esp_err_t eppp_sdio_host_init(struct eppp_config_sdio_s *config);
+esp_err_t eppp_sdio_slave_init(void);
+void eppp_sdio_slave_deinit(void);
+void eppp_sdio_host_deinit(void);
+#else
+static esp_err_t transmit(void *h, void *buffer, size_t len)
+{
+    struct eppp_handle *handle = h;
+#if CONFIG_EPPP_LINK_DEVICE_SPI
+    struct packet buf = { };
+    uint8_t *current_buffer = buffer;
+    size_t remaining = len;
+    do {    // TODO(IDF-9194): Refactor this loop to allocate only once and perform
+        //       fragmentation after receiving from the queue (applicable only if MTU > MAX_PAYLOAD)
+        size_t batch = remaining > MAX_PAYLOAD ? MAX_PAYLOAD : remaining;
+        buf.data = malloc(batch);
+        if (buf.data == NULL) {
+            ESP_LOGE(TAG, "Failed to allocate packet");
+            return ESP_ERR_NO_MEM;
+        }
+        buf.len = batch;
+        remaining -= batch;
+        memcpy(buf.data, current_buffer, batch);
+        current_buffer += batch;
+        BaseType_t ret = xQueueSend(handle->out_queue, &buf, 0);
+        if (ret != pdTRUE) {
+            ESP_LOGE(TAG, "Failed to queue packet to slave!");
+            return ESP_ERR_NO_MEM;
+        }
+    } while (remaining > 0);
+
+    if (handle->role == EPPP_SERVER && handle->blocked == SLAVE_BLOCKED) {
+        uint32_t now = esp_timer_get_time();
+        uint32_t diff = now - handle->slave_last_edge;
+        if (diff < MIN_TRIGGER_US) {
+            esp_rom_delay_us(MIN_TRIGGER_US - diff);
+        }
+        gpio_set_level(handle->gpio_intr, 0);
+    }
+
+#elif CONFIG_EPPP_LINK_DEVICE_UART
+    ESP_LOG_BUFFER_HEXDUMP("ppp_uart_send", buffer, len, ESP_LOG_VERBOSE);
+    uart_write_bytes(handle->uart_port, buffer, len);
+#endif // DEVICE UART or SPI
+    return ESP_OK;
+}
+#endif
+
+static void netif_deinit(esp_netif_t *netif)
 {
     if (netif == NULL) {
         return;
     }
+    struct eppp_handle *h = esp_netif_get_io_driver(netif);
+    if (h == NULL) {
+        return;
+    }
+#if CONFIG_EPPP_LINK_DEVICE_SPI
+    struct packet buf = { };
+    while (xQueueReceive(h->out_queue, &buf, 0) == pdTRUE) {
+        if (buf.len > 0) {
+            free(buf.data);
+        }
+    }
+    vQueueDelete(h->out_queue);
+    if (h->role == EPPP_CLIENT) {
+        vSemaphoreDelete(h->ready_semaphore);
+    }
+#endif
+    free(h);
     esp_netif_destroy(netif);
     if (s_eppp_netif_count > 0) {
         s_eppp_netif_count--;
     }
 }
 
-#ifdef CONFIG_EPPP_LINK_USES_PPP
-#define NETSTACK_CONFIG() ESP_NETIF_NETSTACK_DEFAULT_PPP
-#else
-#define NETSTACK_CONFIG() g_eppp_netif_config_tun
-extern esp_netif_netstack_config_t *g_eppp_netif_config_tun;
-#define ESP_NETIF_INHERENT_DEFAULT_SLIP() \
-    {   \
-        ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(mac) \
-        ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(ip_info) \
-        .flags = ESP_NETIF_FLAG_EVENT_IP_MODIFIED,              \
-        .get_ip_event = IP_EVENT_PPP_GOT_IP,    \
-        .lost_ip_event = IP_EVENT_PPP_LOST_IP,   \
-        .if_key = "EPPP_TUN",  \
-        .if_desc = "eppp",    \
-        .route_prio = 1,     \
-        .bridge_info = NULL \
-};
-#endif // CONFIG_EPPP_LINK_USES_PPP
-
-esp_netif_t *eppp_netif_init(eppp_type_t role, eppp_transport_handle_t h, eppp_config_t *eppp_config)
+static esp_netif_t *netif_init(eppp_type_t role, eppp_config_t *eppp_config)
 {
     if (s_eppp_netif_count > 9) {   // Limit to max 10 netifs, since we use "EPPPx" as the unique key (where x is 0-9)
         ESP_LOGE(TAG, "Cannot create more than 10 instances");
         return NULL;
     }
 
+    // Create the object first
+    struct eppp_handle *h = calloc(1, sizeof(struct eppp_handle));
+    if (!h) {
+        ESP_LOGE(TAG, "Failed to allocate eppp_handle");
+        return NULL;
+    }
     h->role = role;
-#ifdef CONFIG_EPPP_LINK_USES_PPP
-    esp_netif_inherent_config_t base_netif_cfg = ESP_NETIF_INHERENT_DEFAULT_PPP();
-#else
-    esp_netif_inherent_config_t base_netif_cfg = ESP_NETIF_INHERENT_DEFAULT_SLIP();
-    esp_netif_ip_info_t slip_ip4 = {};
-    slip_ip4.ip.addr = eppp_config->ppp.our_ip4_addr.addr;
-    slip_ip4.gw.addr = eppp_config->ppp.their_ip4_addr.addr;
-    slip_ip4.netmask.addr = ESP_IP4TOADDR(255, 255, 255, 0);
-    base_netif_cfg.ip_info = &slip_ip4;
+#if CONFIG_EPPP_LINK_DEVICE_SPI
+    h->out_queue = xQueueCreate(CONFIG_EPPP_LINK_PACKET_QUEUE_SIZE, sizeof(struct packet));
+    if (!h->out_queue) {
+        ESP_LOGE(TAG, "Failed to create the packet queue");
+        free(h);
+        return NULL;
+    }
+    if (role == EPPP_CLIENT) {
+        h->ready_semaphore = xSemaphoreCreateBinary();
+        if (!h->ready_semaphore) {
+            ESP_LOGE(TAG, "Failed to create the packet queue");
+            vQueueDelete(h->out_queue);
+            free(h);
+            return NULL;
+        }
+    }
+    h->transaction_size = 0;
+    h->outbound.data = NULL;
+    h->outbound.len = 0;
+    if (role == EPPP_SERVER) {
+        esp_timer_create_args_t args = {
+            .callback = &timer_callback,
+            .arg = h,
+            .name = "timer"
+        };
+        if (esp_timer_create(&args, &h->timer) != ESP_OK) {
+            ESP_LOGE(TAG, "Failed to create the packet queue");
+            vQueueDelete(h->out_queue);
+            vSemaphoreDelete(h->ready_semaphore);
+            free(h);
+            return NULL;
+        }
+    }
+
 #endif
+
+    esp_netif_driver_ifconfig_t driver_cfg = {
+        .handle = h,
+#if CONFIG_EPPP_LINK_DEVICE_SDIO
+        .transmit = role == EPPP_CLIENT ? eppp_sdio_host_tx : eppp_sdio_slave_tx,
+#else
+        .transmit = transmit,
+#endif
+    };
+    const esp_netif_driver_ifconfig_t *ppp_driver_cfg = &driver_cfg;
+
+    esp_netif_inherent_config_t base_netif_cfg = ESP_NETIF_INHERENT_DEFAULT_PPP();
     char if_key[] = "EPPP0"; // netif key needs to be unique
     if_key[sizeof(if_key) - 2 /* 2 = two chars before the terminator */ ] += s_eppp_netif_count++;
     base_netif_cfg.if_key = if_key;
@@ -93,27 +242,25 @@ esp_netif_t *eppp_netif_init(eppp_type_t role, eppp_transport_handle_t h, eppp_c
     if (eppp_config->ppp.netif_prio) {
         base_netif_cfg.route_prio = eppp_config->ppp.netif_prio;
     }
-    esp_netif_config_t netif_config = { .base = &base_netif_cfg,
-                                        .driver = NULL,
-                                        .stack = NETSTACK_CONFIG(),
-                                      };
+    esp_netif_config_t netif_ppp_config = { .base = &base_netif_cfg,
+                                            .driver = ppp_driver_cfg,
+                                            .stack = ESP_NETIF_NETSTACK_DEFAULT_PPP
+                                          };
 
-#ifdef CONFIG_EPPP_LINK_USES_PPP
-    __attribute__((unused)) esp_err_t ret = ESP_OK;
-    esp_netif_t *netif = esp_netif_new(&netif_config);
-    esp_netif_ppp_config_t netif_params;
-    ESP_GOTO_ON_ERROR(esp_netif_ppp_get_params(netif, &netif_params), err, TAG, "Failed to get PPP params");
-    netif_params.ppp_our_ip4_addr = eppp_config->ppp.our_ip4_addr;
-    netif_params.ppp_their_ip4_addr = eppp_config->ppp.their_ip4_addr;
-    netif_params.ppp_error_event_enabled = true;
-    ESP_GOTO_ON_ERROR(esp_netif_ppp_set_params(netif, &netif_params), err, TAG, "Failed to set PPP params");
+    esp_netif_t *netif = esp_netif_new(&netif_ppp_config);
+    if (!netif) {
+        ESP_LOGE(TAG, "Failed to create esp_netif");
+#if CONFIG_EPPP_LINK_DEVICE_SPI
+        vQueueDelete(h->out_queue);
+        if (h->ready_semaphore) {
+            vSemaphoreDelete(h->ready_semaphore);
+        }
+#endif
+        free(h);
+        return NULL;
+    }
     return netif;
-err:
-    esp_netif_destroy(netif);
-    return NULL;
-#else
-    return esp_netif_new(&netif_config);
-#endif // CONFIG_EPPP_LINK_USES_PPP
+
 }
 
 esp_err_t eppp_netif_stop(esp_netif_t *netif, int stop_timeout_ms)
@@ -138,12 +285,7 @@ esp_err_t eppp_netif_start(esp_netif_t *netif)
 {
     esp_netif_action_start(netif, 0, 0, 0);
     esp_netif_action_connected(netif, 0, 0, 0);
-#ifndef CONFIG_EPPP_LINK_USES_PPP
-    // PPP provides address negotiation, if not PPP, we need to check connection manually
-    return eppp_check_connection(netif);
-#else
     return ESP_OK;
-#endif
 }
 
 static int get_netif_num(esp_netif_t *netif)
@@ -163,17 +305,16 @@ static int get_netif_num(esp_netif_t *netif)
     return  netif_cnt;
 }
 
-#ifdef CONFIG_EPPP_LINK_USES_PPP
 static void on_ppp_event(void *arg, esp_event_base_t base, int32_t event_id, void *data)
 {
     esp_netif_t **netif = data;
+    ESP_LOGD(TAG, "PPP status event: %" PRId32, event_id);
     if (base == NETIF_PPP_STATUS && event_id == NETIF_PPP_ERRORUSER) {
         ESP_LOGI(TAG, "Disconnected %d", get_netif_num(*netif));
         struct eppp_handle *h = esp_netif_get_io_driver(*netif);
         h->netif_stop = true;
     }
 }
-#endif // CONFIG_EPPP_LINK_USES_PPP
 
 static void on_ip_event(void *arg, esp_event_base_t base, int32_t event_id, void *data)
 {
@@ -200,7 +341,356 @@ static void on_ip_event(void *arg, esp_event_base_t base, int32_t event_id, void
     }
 }
 
-#if EPPP_NEEDS_TASK
+#if CONFIG_EPPP_LINK_DEVICE_SPI
+
+#define SPI_ALIGN(size) (((size) + 3U) & ~(3U))
+#define TRANSFER_SIZE SPI_ALIGN((MAX_PAYLOAD + 6))
+#define NEXT_TRANSACTION_SIZE(a,b) (((a)>(b))?(a):(b)) /* next transaction: whichever is bigger */
+
+static void IRAM_ATTR timer_callback(void *arg)
+{
+    struct eppp_handle *h = arg;
+    if (h->blocked == SLAVE_WANTS_WRITE) {
+        gpio_set_level(h->gpio_intr, 0);
+    }
+}
+
+static void IRAM_ATTR gpio_isr_handler(void *arg)
+{
+    static uint32_t s_last_time;
+    uint32_t now = esp_timer_get_time();
+    uint32_t diff = now - s_last_time;
+    if (diff < MIN_TRIGGER_US) { // debounce
+        return;
+    }
+    s_last_time = now;
+    struct eppp_handle *h = arg;
+    BaseType_t yield = false;
+
+    // Positive edge means SPI slave prepared the data
+    if (gpio_get_level(h->gpio_intr) == 1) {
+        xSemaphoreGiveFromISR(h->ready_semaphore, &yield);
+        if (yield) {
+            portYIELD_FROM_ISR();
+        }
+        return;
+    }
+
+    // Negative edge (when master blocked) means that slave wants to transmit
+    if (h->blocked == MASTER_BLOCKED) {
+        struct packet buf = { .data = NULL, .len = -1 };
+        xQueueSendFromISR(h->out_queue, &buf, &yield);
+        if (yield) {
+            portYIELD_FROM_ISR();
+        }
+    }
+}
+
+static esp_err_t deinit_master(esp_netif_t *netif)
+{
+    struct eppp_handle *h = esp_netif_get_io_driver(netif);
+    ESP_RETURN_ON_ERROR(spi_bus_remove_device(h->spi_device), TAG, "Failed to remove SPI bus");
+    ESP_RETURN_ON_ERROR(spi_bus_free(h->spi_host), TAG, "Failed to free SPI bus");
+    return ESP_OK;
+}
+
+static esp_err_t init_master(struct eppp_config_spi_s *config, esp_netif_t *netif)
+{
+    struct eppp_handle *h = esp_netif_get_io_driver(netif);
+    h->spi_host = config->host;
+    h->gpio_intr = config->intr;
+    spi_bus_config_t bus_cfg = {};
+    bus_cfg.mosi_io_num = config->mosi;
+    bus_cfg.miso_io_num = config->miso;
+    bus_cfg.sclk_io_num = config->sclk;
+    bus_cfg.quadwp_io_num = -1;
+    bus_cfg.quadhd_io_num = -1;
+    bus_cfg.max_transfer_sz = TRANSFER_SIZE;
+    bus_cfg.flags = 0;
+    bus_cfg.intr_flags = 0;
+
+    // TODO: Init and deinit SPI bus separately (per Kconfig?)
+    if (spi_bus_initialize(config->host, &bus_cfg, SPI_DMA_CH_AUTO) != ESP_OK) {
+        return ESP_FAIL;
+    }
+
+    spi_device_interface_config_t dev_cfg = {};
+    dev_cfg.clock_speed_hz = config->freq;
+    dev_cfg.mode = 0;
+    dev_cfg.spics_io_num = config->cs;
+    dev_cfg.cs_ena_pretrans = config->cs_ena_pretrans;
+    dev_cfg.cs_ena_posttrans = config->cs_ena_posttrans;
+    dev_cfg.duty_cycle_pos = 128;
+    dev_cfg.input_delay_ns = config->input_delay_ns;
+    dev_cfg.pre_cb = NULL;
+    dev_cfg.post_cb = NULL;
+    dev_cfg.queue_size = 3;
+
+    if (spi_bus_add_device(config->host, &dev_cfg, &h->spi_device) != ESP_OK) {
+        return ESP_FAIL;
+    }
+
+    //GPIO config for the handshake line.
+    gpio_config_t io_conf = {
+        .intr_type = GPIO_INTR_ANYEDGE,
+        .mode = GPIO_MODE_INPUT,
+        .pull_up_en = 1,
+        .pin_bit_mask = BIT64(config->intr),
+    };
+
+    gpio_config(&io_conf);
+    gpio_install_isr_service(0);
+    gpio_set_intr_type(config->intr, GPIO_INTR_ANYEDGE);
+    gpio_isr_handler_add(config->intr, gpio_isr_handler, esp_netif_get_io_driver(netif));
+    return ESP_OK;
+}
+
+static void post_setup(spi_slave_transaction_t *trans)
+{
+    struct eppp_handle *h = trans->user;
+    h->slave_last_edge = esp_timer_get_time();
+    gpio_set_level(h->gpio_intr, 1);
+    if (h->transaction_size == 0) { // If no transaction planned:
+        if (h->outbound.len == 0) { // we're blocked if we don't have any data
+            h->blocked = SLAVE_BLOCKED;
+        } else {
+            h->blocked = SLAVE_WANTS_WRITE; // we notify the master that we want to write
+            esp_timer_start_once(h->timer, MIN_TRIGGER_US);
+        }
+    }
+}
+
+static void post_trans(spi_slave_transaction_t *trans)
+{
+    struct eppp_handle *h = trans->user;
+    h->blocked = NONE;
+    gpio_set_level(h->gpio_intr, 0);
+}
+
+static esp_err_t deinit_slave(esp_netif_t *netif)
+{
+    struct eppp_handle *h = esp_netif_get_io_driver(netif);
+    ESP_RETURN_ON_ERROR(spi_slave_free(h->spi_host), TAG, "Failed to free SPI slave host");
+    ESP_RETURN_ON_ERROR(spi_bus_remove_device(h->spi_device), TAG, "Failed to remove SPI device");
+    ESP_RETURN_ON_ERROR(spi_bus_free(h->spi_host), TAG, "Failed to free SPI bus");
+    return ESP_OK;
+}
+
+static esp_err_t init_slave(struct eppp_config_spi_s *config, esp_netif_t *netif)
+{
+    struct eppp_handle *h = esp_netif_get_io_driver(netif);
+    h->spi_host = config->host;
+    h->gpio_intr = config->intr;
+    spi_bus_config_t bus_cfg = {};
+    bus_cfg.mosi_io_num = config->mosi;
+    bus_cfg.miso_io_num = config->miso;
+    bus_cfg.sclk_io_num = config->sclk;
+    bus_cfg.quadwp_io_num = -1;
+    bus_cfg.quadhd_io_num = -1;
+    bus_cfg.flags = 0;
+    bus_cfg.intr_flags = 0;
+
+    //Configuration for the SPI slave interface
+    spi_slave_interface_config_t slvcfg = {
+        .mode = 0,
+        .spics_io_num = config->cs,
+        .queue_size = 3,
+        .flags = 0,
+        .post_setup_cb = post_setup,
+        .post_trans_cb = post_trans,
+    };
+
+    //Configuration for the handshake line
+    gpio_config_t io_conf = {
+        .intr_type = GPIO_INTR_DISABLE,
+        .mode = GPIO_MODE_OUTPUT,
+        .pin_bit_mask = BIT64(config->intr),
+    };
+
+    gpio_config(&io_conf);
+    gpio_set_pull_mode(config->mosi, GPIO_PULLUP_ONLY);
+    gpio_set_pull_mode(config->sclk, GPIO_PULLUP_ONLY);
+    gpio_set_pull_mode(config->cs, GPIO_PULLUP_ONLY);
+
+    //Initialize SPI slave interface
+    if (spi_slave_initialize(config->host, &bus_cfg, &slvcfg, SPI_DMA_CH_AUTO) != ESP_OK) {
+        return ESP_FAIL;
+    }
+    return ESP_OK;
+}
+
+typedef esp_err_t (*perform_transaction_t)(struct eppp_handle *h, size_t len, const void *tx_buffer, void *rx_buffer);
+
+static esp_err_t perform_transaction_master(struct eppp_handle *h, size_t len, const void *tx_buffer, void *rx_buffer)
+{
+    spi_transaction_t t = {};
+    t.length = len * 8;
+    t.tx_buffer = tx_buffer;
+    t.rx_buffer = rx_buffer;
+    return spi_device_transmit(h->spi_device, &t);
+}
+
+static esp_err_t perform_transaction_slave(struct eppp_handle *h, size_t len, const void *tx_buffer, void *rx_buffer)
+{
+    spi_slave_transaction_t t = {};
+    t.user = h;
+    t.length = len * 8;
+    t.tx_buffer = tx_buffer;
+    t.rx_buffer = rx_buffer;
+    return spi_slave_transmit(h->spi_host, &t, portMAX_DELAY);
+}
+
+esp_err_t eppp_perform(esp_netif_t *netif)
+{
+    static WORD_ALIGNED_ATTR uint8_t out_buf[TRANSFER_SIZE] = {};
+    static WORD_ALIGNED_ATTR uint8_t in_buf[TRANSFER_SIZE] = {};
+
+    struct eppp_handle *h = esp_netif_get_io_driver(netif);
+
+    // Perform transaction for master and slave
+    const perform_transaction_t perform_transaction = h->role == EPPP_CLIENT ? perform_transaction_master : perform_transaction_slave;
+
+    if (h->stop) {
+        return ESP_ERR_TIMEOUT;
+    }
+
+    BaseType_t tx_queue_stat;
+    bool allow_test_tx = false;
+    uint16_t next_tx_size = 0;
+    if (h->role == EPPP_CLIENT) {
+        // SPI MASTER only code
+        if (xSemaphoreTake(h->ready_semaphore, pdMS_TO_TICKS(1000)) != pdTRUE) {
+            // slave might not be ready, but maybe we just missed an interrupt
+            allow_test_tx = true;
+        }
+        if (h->outbound.len == 0 && h->transaction_size == 0 && h->blocked == NONE) {
+            h->blocked = MASTER_BLOCKED;
+            xQueueReceive(h->out_queue, &h->outbound, portMAX_DELAY);
+            h->blocked = NONE;
+            if (h->outbound.len == -1) {
+                h->outbound.len = 0;
+                h->blocked = MASTER_WANTS_READ;
+            }
+        } else if (h->blocked == MASTER_WANTS_READ) {
+            h->blocked = NONE;
+        }
+    }
+    struct header *head = (void *)out_buf;
+    if (h->outbound.len <= h->transaction_size && allow_test_tx == false) {
+        // sending outbound
+        head->size = h->outbound.len;
+        if (h->outbound.len > 0) {
+            memcpy(out_buf + sizeof(struct header), h->outbound.data, h->outbound.len);
+            free(h->outbound.data);
+            ESP_LOG_BUFFER_HEXDUMP(TAG, out_buf + sizeof(struct header), head->size, ESP_LOG_VERBOSE);
+            h->outbound.data = NULL;
+            h->outbound.len = 0;
+        }
+        do {
+            tx_queue_stat = xQueueReceive(h->out_queue, &h->outbound, 0);
+        } while (tx_queue_stat == pdTRUE && h->outbound.len == -1);
+        if (h->outbound.len == -1) { // used as a signal only, no actual data
+            h->outbound.len = 0;
+        }
+    } else {
+        // outbound is bigger, need to transmit in another transaction (keep this empty)
+        head->size = 0;
+    }
+    next_tx_size = head->next_size = h->outbound.len;
+    head->magic = SPI_HEADER_MAGIC;
+    head->check = esp_rom_crc16_le(0, out_buf, sizeof(struct header) - sizeof(uint16_t));
+    esp_err_t ret = perform_transaction(h, sizeof(struct header) + h->transaction_size, out_buf, in_buf);
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "spi_device_transmit failed");
+        h->transaction_size = 0; // need to start with HEADER only transaction
+        return ESP_FAIL;
+    }
+    head = (void *)in_buf;
+    uint16_t check = esp_rom_crc16_le(0, in_buf, sizeof(struct header) - sizeof(uint16_t));
+    if (check != head->check || head->magic != SPI_HEADER_MAGIC) {
+        h->transaction_size = 0; // need to start with HEADER only transaction
+        if (allow_test_tx) {
+            return ESP_OK;
+        }
+        ESP_LOGE(TAG, "Wrong checksum or magic");
+        return ESP_FAIL;
+    }
+    if (head->size > 0) {
+        ESP_LOG_BUFFER_HEXDUMP(TAG, in_buf + sizeof(struct header), head->size, ESP_LOG_VERBOSE);
+        esp_netif_receive(netif, in_buf + sizeof(struct header), head->size, NULL);
+    }
+    h->transaction_size = NEXT_TRANSACTION_SIZE(next_tx_size, head->next_size);
+    return ESP_OK;
+}
+
+#elif CONFIG_EPPP_LINK_DEVICE_UART
+#define BUF_SIZE (1024)
+
+static esp_err_t init_uart(struct eppp_handle *h, eppp_config_t *config)
+{
+    h->uart_port = config->uart.port;
+    uart_config_t uart_config = {};
+    uart_config.baud_rate = config->uart.baud;
+    uart_config.data_bits = UART_DATA_8_BITS;
+    uart_config.parity    = UART_PARITY_DISABLE;
+    uart_config.stop_bits = UART_STOP_BITS_1;
+    uart_config.flow_ctrl = UART_HW_FLOWCTRL_DISABLE;
+    uart_config.source_clk = UART_SCLK_DEFAULT;
+
+    ESP_RETURN_ON_ERROR(uart_driver_install(h->uart_port, config->uart.rx_buffer_size, 0, config->uart.queue_size, &h->uart_event_queue, 0), TAG, "Failed to install UART");
+    ESP_RETURN_ON_ERROR(uart_param_config(h->uart_port, &uart_config), TAG, "Failed to set params");
+    ESP_RETURN_ON_ERROR(uart_set_pin(h->uart_port, config->uart.tx_io, config->uart.rx_io, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE), TAG, "Failed to set UART pins");
+    ESP_RETURN_ON_ERROR(uart_set_rx_timeout(h->uart_port, 1), TAG, "Failed to set UART Rx timeout");
+    return ESP_OK;
+}
+
+static void deinit_uart(struct eppp_handle *h)
+{
+    uart_driver_delete(h->uart_port);
+}
+
+esp_err_t eppp_perform(esp_netif_t *netif)
+{
+    static uint8_t buffer[BUF_SIZE] = {};
+    struct eppp_handle *h = esp_netif_get_io_driver(netif);
+    uart_event_t event = {};
+    if (h->stop) {
+        return ESP_ERR_TIMEOUT;
+    }
+
+    if (xQueueReceive(h->uart_event_queue, &event, pdMS_TO_TICKS(100)) != pdTRUE) {
+        return ESP_OK;
+    }
+    if (event.type == UART_DATA) {
+        size_t len;
+        uart_get_buffered_data_len(h->uart_port, &len);
+        if (len) {
+            len = uart_read_bytes(h->uart_port, buffer, BUF_SIZE, 0);
+            ESP_LOG_BUFFER_HEXDUMP("ppp_uart_recv", buffer, len, ESP_LOG_VERBOSE);
+            esp_netif_receive(netif, buffer, len, NULL);
+        }
+    } else {
+        ESP_LOGW(TAG, "Received UART event: %d", event.type);
+    }
+    return ESP_OK;
+}
+#elif CONFIG_EPPP_LINK_DEVICE_SDIO
+
+esp_err_t eppp_perform(esp_netif_t *netif)
+{
+    struct eppp_handle *h = esp_netif_get_io_driver(netif);
+    if (h->stop) {
+        return ESP_ERR_TIMEOUT;
+    }
+    if (h->role == EPPP_SERVER) {
+        return eppp_sdio_slave_rx(netif);
+    } else {
+        return eppp_sdio_host_rx(netif);
+    }
+}
+
+#endif // CONFIG_EPPP_LINK_DEVICE_SPI / UART
+
 static void ppp_task(void *args)
 {
     esp_netif_t *netif = args;
@@ -209,7 +699,6 @@ static void ppp_task(void *args)
     h->exited = true;
     vTaskDelete(NULL);
 }
-#endif
 
 static bool have_some_eppp_netif(esp_netif_t *netif, void *ctx)
 {
@@ -220,13 +709,11 @@ static void remove_handlers(void)
 {
     esp_netif_t *netif = esp_netif_find_if(have_some_eppp_netif, NULL);
     if (netif == NULL) {
-        // if EPPP netif in the system, we clean up the statics
+        // if EPPP netif in the system, we cleanup the statics
         vEventGroupDelete(s_event_group);
         s_event_group = NULL;
         esp_event_handler_unregister(IP_EVENT, ESP_EVENT_ANY_ID, on_ip_event);
-#ifdef CONFIG_EPPP_LINK_USES_PPP
         esp_event_handler_unregister(NETIF_PPP_STATUS, ESP_EVENT_ANY_ID, on_ppp_event);
-#endif
     }
 }
 
@@ -235,33 +722,67 @@ void eppp_deinit(esp_netif_t *netif)
     if (netif == NULL) {
         return;
     }
+#if CONFIG_EPPP_LINK_DEVICE_SPI
     struct eppp_handle *h = esp_netif_get_io_driver(netif);
-    EPPP_TRANSPORT_DEINIT(h);
-    eppp_netif_deinit(netif);
+    if (h->role == EPPP_CLIENT) {
+        deinit_master(netif);
+    } else {
+        deinit_slave(netif);
+    }
+#elif CONFIG_EPPP_LINK_DEVICE_UART
+    deinit_uart(esp_netif_get_io_driver(netif));
+#elif CONFIG_EPPP_LINK_DEVICE_SDIO
+    struct eppp_handle *h = esp_netif_get_io_driver(netif);
+    if (h->role == EPPP_CLIENT) {
+        eppp_sdio_host_deinit();
+    } else {
+        eppp_sdio_slave_deinit();
+    }
+#endif
+    netif_deinit(netif);
 }
 
 esp_netif_t *eppp_init(eppp_type_t role, eppp_config_t *config)
 {
-    __attribute__((unused)) esp_err_t ret = ESP_OK;
-    esp_netif_t *netif = NULL;
     if (config == NULL || (role != EPPP_SERVER && role != EPPP_CLIENT)) {
         ESP_LOGE(TAG, "Invalid configuration or role");
         return NULL;
     }
 
-    eppp_transport_handle_t h = EPPP_TRANSPORT_INIT(config);
-    ESP_GOTO_ON_FALSE(h, ESP_ERR_NO_MEM, err, TAG, "Failed to init EPPP transport");
-    ESP_GOTO_ON_FALSE(netif = eppp_netif_init(role, h, config), ESP_ERR_NO_MEM, err, TAG, "Failed to init EPPP netif");
-    ESP_GOTO_ON_ERROR(esp_netif_attach(netif, h), err, TAG, "Failed to attach netif to EPPP transport");
+    esp_netif_t *netif = netif_init(role, config);
+    if (!netif) {
+        ESP_LOGE(TAG, "Failed to initialize PPP netif");
+        return NULL;
+    }
+    esp_netif_ppp_config_t netif_params;
+    ESP_ERROR_CHECK(esp_netif_ppp_get_params(netif, &netif_params));
+    netif_params.ppp_our_ip4_addr = config->ppp.our_ip4_addr;
+    netif_params.ppp_their_ip4_addr = config->ppp.their_ip4_addr;
+    netif_params.ppp_error_event_enabled = true;
+    ESP_ERROR_CHECK(esp_netif_ppp_set_params(netif, &netif_params));
+#if CONFIG_EPPP_LINK_DEVICE_SPI
+    if (role == EPPP_CLIENT) {
+        init_master(&config->spi, netif);
+    } else {
+        init_slave(&config->spi, netif);
+
+    }
+#elif CONFIG_EPPP_LINK_DEVICE_UART
+    init_uart(esp_netif_get_io_driver(netif), config);
+#elif CONFIG_EPPP_LINK_DEVICE_SDIO
+    esp_err_t ret;
+    if (role == EPPP_SERVER) {
+        ret = eppp_sdio_slave_init();
+    } else {
+        ret = eppp_sdio_host_init(&config->sdio);
+    }
+
+    if (ret != ESP_OK) {
+        ESP_LOGE(TAG, "Failed to initialize SDIO %d", ret);
+        return NULL;
+    }
+#endif
     return netif;
-err:
-    if (h) {
-        EPPP_TRANSPORT_DEINIT(h);
-    }
-    if (netif) {
-        eppp_netif_deinit(netif);
-    }
-    return NULL;
 }
 
 esp_netif_t *eppp_open(eppp_type_t role, eppp_config_t *config, int connect_timeout_ms)
@@ -300,13 +821,11 @@ esp_netif_t *eppp_open(eppp_type_t role, eppp_config_t *config, int connect_time
             remove_handlers();
             return NULL;
         }
-#ifdef CONFIG_EPPP_LINK_USES_PPP
         if (esp_event_handler_register(NETIF_PPP_STATUS, ESP_EVENT_ANY_ID, on_ppp_event, NULL) !=  ESP_OK) {
             ESP_LOGE(TAG, "Failed to register PPP status handler");
             remove_handlers();
             return NULL;
         }
-#endif // CONFIG_EPPP_LINK_USES_PPP
     }
     esp_netif_t *netif = eppp_init(role, config);
     if (!netif) {
@@ -315,13 +834,12 @@ esp_netif_t *eppp_open(eppp_type_t role, eppp_config_t *config, int connect_time
     }
 
     eppp_netif_start(netif);
-#if EPPP_NEEDS_TASK
+
     if (xTaskCreate(ppp_task, "ppp connect", config->task.stack_size, netif, config->task.priority, NULL) != pdTRUE) {
         ESP_LOGE(TAG, "Failed to create a ppp connection task");
         eppp_deinit(netif);
         return NULL;
     }
-#endif
     int netif_cnt = get_netif_num(netif);
     if (netif_cnt < 0) {
         eppp_close(netif);
@@ -367,24 +885,3 @@ void eppp_close(esp_netif_t *netif)
     eppp_deinit(netif);
     remove_handlers();
 }
-
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-esp_err_t eppp_add_channels(esp_netif_t *netif, eppp_channel_fn_t *tx, const eppp_channel_fn_t rx, void* context)
-{
-    ESP_RETURN_ON_FALSE(netif != NULL && tx != NULL && rx != NULL, ESP_ERR_INVALID_ARG, TAG, "Invalid arguments");
-    struct eppp_handle *h = esp_netif_get_io_driver(netif);
-    ESP_RETURN_ON_FALSE(h != NULL && h->channel_tx != NULL, ESP_ERR_INVALID_STATE, TAG, "Transport not initialized");
-    *tx = h->channel_tx;
-    h->channel_rx = rx;
-    h->context = context;
-    return ESP_OK;
-}
-
-void* eppp_get_context(esp_netif_t *netif)
-{
-    ESP_RETURN_ON_FALSE(netif != NULL, NULL, TAG, "Invalid netif");
-    struct eppp_handle *h = esp_netif_get_io_driver(netif);
-    ESP_RETURN_ON_FALSE(h != NULL, NULL, TAG, "EPPP Not initialized");
-    return h->context;
-}
-#endif

components/eppp_link/eppp_netif_tun.c

@@ -1,207 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <string.h>
-#include <stdint.h>
-#include "sdkconfig.h"
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "esp_netif_net_stack.h"
-#include "lwip/esp_netif_net_stack.h"
-#include "lwip/prot/ethernet.h"
-#include "lwip/inet.h"
-#include "lwip/sockets.h"
-#include "ping/ping_sock.h"
-#include "esp_check.h"
-#include "esp_idf_version.h"
-
-#if defined(CONFIG_ESP_NETIF_RECEIVE_REPORT_ERRORS)
-typedef esp_err_t esp_netif_recv_ret_t;
-#define ESP_NETIF_OPTIONAL_RETURN_CODE(expr) expr
-#else
-typedef void esp_netif_recv_ret_t;
-#define ESP_NETIF_OPTIONAL_RETURN_CODE(expr)
-#endif // CONFIG_ESP_NETIF_RECEIVE_REPORT_ERRORS
-
-static const char *TAG = "eppp_tun_netif";
-
-static esp_netif_recv_ret_t tun_input(void *h, void *buffer, unsigned int len, void *eb)
-{
-    __attribute__((unused)) esp_err_t ret = ESP_OK;
-    struct netif *netif = h;
-    struct pbuf *p = NULL;
-
-    ESP_LOG_BUFFER_HEXDUMP(TAG, buffer, len, ESP_LOG_VERBOSE);
-    // need to alloc extra space for the ETH header to support possible packet forwarding
-    ESP_GOTO_ON_FALSE(p = pbuf_alloc(PBUF_RAW, len + SIZEOF_ETH_HDR, PBUF_RAM), ESP_ERR_NO_MEM, err, TAG, "pbuf_alloc failed");
-    ESP_GOTO_ON_FALSE(pbuf_remove_header(p, SIZEOF_ETH_HDR) == 0, ESP_FAIL, err, TAG, "pbuf_remove_header failed");
-    memcpy(p->payload, buffer, len);
-    ESP_GOTO_ON_FALSE(netif->input(p, netif) == ERR_OK, ESP_FAIL, err, TAG, "failed to input packet to lwip");
-    return ESP_NETIF_OPTIONAL_RETURN_CODE(ESP_OK);
-err:
-    if (p) {
-        pbuf_free(p);
-    }
-    return ESP_NETIF_OPTIONAL_RETURN_CODE(ret);
-}
-
-static err_t tun_output(struct netif *netif, struct pbuf *p)
-{
-    LWIP_ASSERT("netif != NULL", (netif != NULL));
-    LWIP_ASSERT("netif->state != NULL", (netif->state != NULL));
-    LWIP_ASSERT("p != NULL", (p != NULL));
-    esp_err_t ret = esp_netif_transmit(netif->state, p->payload, p->len);
-    switch (ret) {
-    case ESP_OK:
-        return ERR_OK;
-    case ESP_ERR_NO_MEM:
-        return ERR_MEM;
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
-    case ESP_ERR_ESP_NETIF_TX_FAILED:
-        return ERR_BUF;
-#endif
-    case ESP_ERR_INVALID_ARG:
-        return ERR_ARG;
-    default:
-        return ERR_IF;
-    }
-}
-
-static err_t tun_output_v4(struct netif *netif, struct pbuf *p, const ip4_addr_t *ipaddr)
-{
-    LWIP_UNUSED_ARG(ipaddr);
-    return tun_output(netif, p);
-}
-#if LWIP_IPV6
-static err_t tun_output_v6(struct netif *netif, struct pbuf *p, const ip6_addr_t *ipaddr)
-{
-    LWIP_UNUSED_ARG(ipaddr);
-    return tun_output(netif, p);
-}
-#endif
-static err_t tun_init(struct netif *netif)
-{
-    if (netif == NULL) {
-        return ERR_IF;
-    }
-    netif->name[0] = 't';
-    netif->name[1] = 'u';
-#if LWIP_IPV4
-    netif->output = tun_output_v4;
-#endif
-#if LWIP_IPV6
-    netif->output_ip6 = tun_output_v6;
-#endif
-    netif->mtu = 1500;
-    return ERR_OK;
-}
-
-static const struct esp_netif_netstack_config s_config_tun = {
-    .lwip = {
-        .init_fn = tun_init,
-        .input_fn = tun_input,
-    }
-};
-
-const esp_netif_netstack_config_t *g_eppp_netif_config_tun = &s_config_tun;
-
-static void cmd_ping_on_ping_success(esp_ping_handle_t hdl, void *args)
-{
-    uint8_t ttl;
-    uint16_t seqno;
-    uint32_t elapsed_time, recv_len;
-    ip_addr_t target_addr;
-    esp_ping_get_profile(hdl, ESP_PING_PROF_SEQNO, &seqno, sizeof(seqno));
-    esp_ping_get_profile(hdl, ESP_PING_PROF_TTL, &ttl, sizeof(ttl));
-    esp_ping_get_profile(hdl, ESP_PING_PROF_IPADDR, &target_addr, sizeof(target_addr));
-    esp_ping_get_profile(hdl, ESP_PING_PROF_SIZE, &recv_len, sizeof(recv_len));
-    esp_ping_get_profile(hdl, ESP_PING_PROF_TIMEGAP, &elapsed_time, sizeof(elapsed_time));
-    ESP_LOGD(TAG, "%" PRIu32 " bytes from %s icmp_seq=%" PRIu16 " ttl=%" PRIu16 " time=%" PRIu32 " ms\n",
-             recv_len, ipaddr_ntoa((ip_addr_t *)&target_addr), seqno, ttl, elapsed_time);
-    if (esp_ping_stop(hdl) != ESP_OK) {
-        ESP_LOGE(TAG, "Failed to stop ping session");
-        // continue to delete the session
-    }
-    esp_ping_delete_session(hdl);
-    ESP_LOGI(TAG, "PING success -> stop and post IP");
-    esp_netif_t *netif = (esp_netif_t *)args;
-    esp_netif_ip_info_t ip = {0};
-    esp_netif_get_ip_info(netif, &ip);
-    esp_netif_set_ip_info(netif, &ip);
-}
-
-static void cmd_ping_on_ping_timeout(esp_ping_handle_t hdl, void *args)
-{
-    uint16_t seqno;
-    ip_addr_t target_addr;
-    esp_ping_get_profile(hdl, ESP_PING_PROF_SEQNO, &seqno, sizeof(seqno));
-    esp_ping_get_profile(hdl, ESP_PING_PROF_IPADDR, &target_addr, sizeof(target_addr));
-    ESP_LOGD(TAG, "From %s icmp_seq=%" PRIu16 "timeout", ipaddr_ntoa((ip_addr_t *)&target_addr), seqno);
-}
-
-static void cmd_ping_on_ping_end(esp_ping_handle_t hdl, void *args)
-{
-    ip_addr_t target_addr;
-    uint32_t transmitted;
-    uint32_t received;
-    uint32_t total_time_ms;
-    uint32_t loss;
-
-    esp_ping_get_profile(hdl, ESP_PING_PROF_REQUEST, &transmitted, sizeof(transmitted));
-    esp_ping_get_profile(hdl, ESP_PING_PROF_REPLY, &received, sizeof(received));
-    esp_ping_get_profile(hdl, ESP_PING_PROF_IPADDR, &target_addr, sizeof(target_addr));
-    esp_ping_get_profile(hdl, ESP_PING_PROF_DURATION, &total_time_ms, sizeof(total_time_ms));
-
-    if (transmitted > 0) {
-        loss = (uint32_t)((1 - ((float)received) / transmitted) * 100);
-    } else {
-        loss = 0;
-    }
-    if (IP_IS_V4(&target_addr)) {
-        ESP_LOGD(TAG, "\n--- %s ping statistics ---\n", inet_ntoa(*ip_2_ip4(&target_addr)));
-    }
-#if LWIP_IPV6
-    else {
-        ESP_LOGD(TAG, "\n--- %s ping statistics ---\n", inet6_ntoa(*ip_2_ip6(&target_addr)));
-    }
-#endif
-    ESP_LOGI(TAG, "%" PRIu32 " packets transmitted, %" PRIu32 " received, %" PRIu32 "%% packet loss, time %" PRIu32 "ms\n",
-             transmitted, received, loss, total_time_ms);
-    esp_ping_delete_session(hdl);
-}
-
-esp_err_t eppp_check_connection(esp_netif_t *netif)
-{
-    esp_err_t ret = ESP_OK;
-    esp_ping_config_t config = ESP_PING_DEFAULT_CONFIG();
-#if CONFIG_LOG_MAXIMUM_LEVEL > 3
-    config.task_stack_size += 1024;  // Some additional stack needed for verbose logs
-#endif
-    config.count = 100;
-    ESP_LOGI(TAG, "Checking connection on EPPP interface #%" PRIu32, config.interface);
-    ip_addr_t target_addr = {0};
-    esp_netif_ip_info_t ip;
-    esp_netif_get_ip_info(netif, &ip);
-#if LWIP_IPV6
-    target_addr.u_addr.ip4.addr =  ip.gw.addr;
-#else
-    target_addr.addr =  ip.gw.addr;
-#endif
-    config.target_addr = target_addr;
-    esp_ping_callbacks_t cbs = {
-        .cb_args = netif,
-        .on_ping_success = cmd_ping_on_ping_success,
-        .on_ping_timeout = cmd_ping_on_ping_timeout,
-        .on_ping_end = cmd_ping_on_ping_end
-    };
-    esp_ping_handle_t ping;
-    ESP_GOTO_ON_ERROR(esp_ping_new_session(&config, &cbs, &ping), err, TAG, "Failed to create ping session");
-    ESP_GOTO_ON_ERROR(esp_ping_start(ping), err, TAG, "Failed to start ping session");
-    ESP_LOGI(TAG, "Ping started");
-    return ret;
-err:
-    ESP_LOGE(TAG, "Failed to start connection check");
-    return ret;
-}

components/eppp_link/eppp_sdio.c

@@ -1,92 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <string.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "esp_check.h"
-#include "esp_mac.h"
-#include "eppp_link.h"
-#include "eppp_transport.h"
-#include "eppp_transport_sdio.h"
-#include "eppp_sdio.h"
-
-#define TAG "eppp_sdio"
-
-struct eppp_sdio {
-    struct eppp_handle parent;
-    bool is_host;
-};
-
-esp_err_t eppp_sdio_host_tx(void *h, void *buffer, size_t len);
-esp_err_t eppp_sdio_host_rx(esp_netif_t *netif);
-esp_err_t eppp_sdio_slave_rx(esp_netif_t *netif);
-esp_err_t eppp_sdio_slave_tx(void *h, void *buffer, size_t len);
-esp_err_t eppp_sdio_host_init(struct eppp_config_sdio_s *config);
-esp_err_t eppp_sdio_slave_init(struct eppp_config_sdio_s *config);
-void eppp_sdio_slave_deinit(void);
-void eppp_sdio_host_deinit(void);
-
-esp_err_t eppp_perform(esp_netif_t *netif)
-{
-    struct eppp_handle *h = esp_netif_get_io_driver(netif);
-    if (h->stop) {
-        return ESP_ERR_TIMEOUT;
-    }
-    struct eppp_sdio *handle = __containerof(h, struct eppp_sdio, parent);;
-    if (handle->is_host) {
-        return eppp_sdio_host_rx(netif);
-    } else {
-        return eppp_sdio_slave_rx(netif);
-    }
-}
-
-static esp_err_t post_attach(esp_netif_t *esp_netif, void *args)
-{
-    eppp_transport_handle_t h = (eppp_transport_handle_t)args;
-    ESP_RETURN_ON_FALSE(h, ESP_ERR_INVALID_ARG, TAG, "Transport handle cannot be null");
-    struct eppp_sdio *sdio = __containerof(h, struct eppp_sdio, parent);
-    h->base.netif = esp_netif;
-
-    esp_netif_driver_ifconfig_t driver_ifconfig = {
-        .handle =  h,
-        .transmit = sdio->is_host ? eppp_sdio_host_tx : eppp_sdio_slave_tx,
-    };
-
-    ESP_RETURN_ON_ERROR(esp_netif_set_driver_config(esp_netif, &driver_ifconfig), TAG, "Failed to set driver config");
-    ESP_LOGI(TAG, "EPPP SDIO transport attached to EPPP netif %s", esp_netif_get_desc(esp_netif));
-    return ESP_OK;
-}
-
-eppp_transport_handle_t eppp_sdio_init(struct eppp_config_sdio_s *config)
-{
-    __attribute__((unused)) esp_err_t ret = ESP_OK;
-    ESP_RETURN_ON_FALSE(config, NULL, TAG, "Config cannot be null");
-    struct eppp_sdio *h = calloc(1, sizeof(struct eppp_sdio));
-    ESP_RETURN_ON_FALSE(h, NULL, TAG, "Failed to allocate eppp_handle");
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-    h->parent.channel_tx = eppp_sdio_transmit_channel;
-#endif
-    h->parent.base.post_attach = post_attach;
-    h->is_host = config->is_host;
-    esp_err_t (*init_fn)(struct eppp_config_sdio_s * eppp_config) = h->is_host ? eppp_sdio_host_init : eppp_sdio_slave_init;
-    ESP_GOTO_ON_ERROR(init_fn(config), err, TAG, "Failed to init SDIO");
-    return &h->parent;
-err:
-    free(h);
-    return NULL;
-}
-
-void eppp_sdio_deinit(eppp_transport_handle_t h)
-{
-    struct eppp_sdio *sdio = __containerof(h, struct eppp_sdio, parent);
-    if (sdio->is_host) {
-        eppp_sdio_host_deinit();
-    } else {
-        eppp_sdio_slave_deinit();
-    }
-}

components/eppp_link/eppp_sdio.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,10 +8,8 @@
 #define MAX_SDIO_PAYLOAD 1500
 #define SDIO_ALIGN(size) (((size) + 3U) & ~(3U))
 #define SDIO_PAYLOAD SDIO_ALIGN(MAX_SDIO_PAYLOAD)
-#define SDIO_PACKET_SIZE SDIO_ALIGN(MAX_SDIO_PAYLOAD + 4)
 #define PPP_SOF 0x7E
 
-
 // Interrupts and registers
 #define SLAVE_INTR      0
 #define SLAVE_REG_REQ   0
@@ -19,11 +17,3 @@
 // Requests from host to slave
 #define REQ_RESET 1
 #define REQ_INIT  2
-
-struct header {
-    uint8_t magic;
-    uint8_t channel;
-    uint16_t size;
-} __attribute__((packed));
-
-esp_err_t eppp_sdio_transmit_channel(esp_netif_t *netif, int channel, void *buffer, size_t len);

components/eppp_link/eppp_sdio_host.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,8 +8,6 @@
 #include "sdkconfig.h"
 #include "esp_log.h"
 #include "esp_netif.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
 #include "driver/sdio_slave.h"
 #include "esp_serial_slave_link/essl_sdio.h"
 #include "eppp_sdio.h"
@@ -17,7 +15,6 @@
 #include "sdmmc_cmd.h"
 #include "esp_check.h"
 #include "eppp_link.h"
-#include "eppp_transport.h"
 
 #if CONFIG_EPPP_LINK_DEVICE_SDIO_HOST
 
@@ -31,23 +28,22 @@ static SemaphoreHandle_t s_essl_mutex = NULL;
 static essl_handle_t s_essl = NULL;
 static sdmmc_card_t *s_card = NULL;
 
-static DRAM_DMA_ALIGNED_ATTR uint8_t send_buffer[SDIO_PACKET_SIZE];
-static DMA_ATTR uint8_t rcv_buffer[SDIO_PACKET_SIZE];
+static DRAM_DMA_ALIGNED_ATTR uint8_t send_buffer[SDIO_PAYLOAD];
+static DMA_ATTR uint8_t rcv_buffer[SDIO_PAYLOAD];
 
-static esp_err_t eppp_sdio_host_tx_generic(int channel, void *buffer, size_t len)
+esp_err_t eppp_sdio_host_tx(void *h, void *buffer, size_t len)
 {
     if (s_essl == NULL || s_essl_mutex == NULL) {
         // silently skip the Tx if the SDIO not fully initialized
         return ESP_OK;
     }
 
-
-    struct header *head = (void *)send_buffer;
-    head->magic = PPP_SOF;
-    head->channel = channel;
-    head->size = len;
-    memcpy(send_buffer + sizeof(struct header), buffer, len);
-    size_t send_len = SDIO_ALIGN(len + sizeof(struct header));
+    memcpy(send_buffer, buffer, len);
+    size_t send_len = SDIO_ALIGN(len);
+    if (send_len > len) {
+        // pad with SOF's
+        memset(&send_buffer[len], PPP_SOF, send_len - len);
+    }
     xSemaphoreTake(s_essl_mutex, portMAX_DELAY);
     esp_err_t ret = essl_send_packet(s_essl, send_buffer, send_len, PACKET_TIMEOUT_MS);
     if (ret != ESP_OK) {
@@ -60,19 +56,6 @@ static esp_err_t eppp_sdio_host_tx_generic(int channel, void *buffer, size_t len
     return ret;
 }
 
-esp_err_t eppp_sdio_host_tx(void *h, void *buffer, size_t len)
-{
-    return eppp_sdio_host_tx_generic(0, buffer, len);
-}
-
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-esp_err_t eppp_sdio_transmit_channel(esp_netif_t *netif, int channel, void *buffer, size_t len)
-{
-    return eppp_sdio_host_tx_generic(channel, buffer, len);
-}
-#endif
-
-
 static esp_err_t request_slave_reset(void)
 {
     esp_err_t ret = ESP_OK;
@@ -162,37 +145,15 @@ esp_err_t eppp_sdio_host_rx(esp_netif_t *netif)
     if (intr & ESSL_SDIO_DEF_ESP32.new_packet_intr_mask) {
         esp_err_t ret;
         do {
-            size_t size_read = SDIO_PACKET_SIZE;
-            ret = essl_get_packet(s_essl, rcv_buffer, SDIO_PACKET_SIZE, &size_read, PACKET_TIMEOUT_MS);
+            size_t size_read = SDIO_PAYLOAD;
+            ret = essl_get_packet(s_essl, rcv_buffer, SDIO_PAYLOAD, &size_read, PACKET_TIMEOUT_MS);
             if (ret == ESP_ERR_NOT_FOUND) {
                 ESP_LOGE(TAG, "interrupt but no data can be read");
                 break;
             } else if (ret == ESP_OK) {
                 ESP_LOGD(TAG, "receive data, size: %d", size_read);
-                struct header *head = (void *)rcv_buffer;
-                if (head->magic != PPP_SOF) {
-                    ESP_LOGE(TAG, "invalid magic %x", head->magic);
-                    break;
-                }
-                if (head->channel > NR_OF_CHANNELS) {
-                    ESP_LOGE(TAG, "invalid channel %x", head->channel);
-                    break;
-                }
-                if (head->size > SDIO_PAYLOAD || head->size > size_read) {
-                    ESP_LOGE(TAG, "invalid size %x", head->size);
-                    break;
-                }
                 ESP_LOG_BUFFER_HEXDUMP(TAG, rcv_buffer, size_read, ESP_LOG_VERBOSE);
-                if (head->channel == 0) {
-                    esp_netif_receive(netif, rcv_buffer + sizeof(struct header), head->size, NULL);
-                } else {
-#if defined(CONFIG_EPPP_LINK_CHANNELS_SUPPORT)
-                    struct eppp_handle *h = esp_netif_get_io_driver(netif);
-                    if (h->channel_rx) {
-                        h->channel_rx(netif, head->channel, rcv_buffer + sizeof(struct header), head->size);
-                    }
-#endif
-                }
+                esp_netif_receive(netif, rcv_buffer, size_read, NULL);
                 break;
             } else {
                 ESP_LOGE(TAG, "rx packet error: %08X", ret);

components/eppp_link/eppp_sdio_slave.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,13 +8,10 @@
 #include "sdkconfig.h"
 #include "esp_log.h"
 #include "esp_netif.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
 #include "driver/sdio_slave.h"
-#include "eppp_link.h"
-#include "eppp_transport.h"
 #include "eppp_sdio.h"
 #include "esp_check.h"
+
 #if CONFIG_EPPP_LINK_DEVICE_SDIO_SLAVE
 #define BUFFER_NUM 4
 #define BUFFER_SIZE SDIO_PAYLOAD
@@ -23,18 +20,19 @@ static DMA_ATTR uint8_t sdio_slave_rx_buffer[BUFFER_NUM][BUFFER_SIZE];
 static DMA_ATTR uint8_t sdio_slave_tx_buffer[SDIO_PAYLOAD];
 static int s_slave_request = 0;
 
-static esp_err_t eppp_sdio_host_tx_generic(int channel, void *buffer, size_t len)
+esp_err_t eppp_sdio_slave_tx(void *h, void *buffer, size_t len)
 {
     if (s_slave_request != REQ_INIT) {
         // silently skip the Tx if the SDIO not fully initialized
         return ESP_OK;
     }
-    struct header *head = (void *)sdio_slave_tx_buffer;
-    head->magic = PPP_SOF;
-    head->channel = channel;
-    head->size = len;
-    memcpy(sdio_slave_tx_buffer + sizeof(struct header), buffer, len);
-    size_t send_len = SDIO_ALIGN(len + sizeof(struct header));
+    memcpy(sdio_slave_tx_buffer, buffer, len);
+    size_t send_len = SDIO_ALIGN(len);
+    if (send_len > len) {
+        // pad with SOF's if the size is not 4 bytes aligned
+        memset(&sdio_slave_tx_buffer[len], PPP_SOF, send_len - len);
+    }
+
     ESP_LOG_BUFFER_HEXDUMP(TAG, sdio_slave_tx_buffer, send_len, ESP_LOG_VERBOSE);
     esp_err_t ret = sdio_slave_transmit(sdio_slave_tx_buffer, send_len);
     if (ret != ESP_OK) {
@@ -45,18 +43,6 @@ static esp_err_t eppp_sdio_host_tx_generic(int channel, void *buffer, size_t len
     return ESP_OK;
 }
 
-esp_err_t eppp_sdio_slave_tx(void *h, void *buffer, size_t len)
-{
-    return eppp_sdio_host_tx_generic(0, buffer, len);
-}
-
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-esp_err_t eppp_sdio_transmit_channel(esp_netif_t *netif, int channel, void *buffer, size_t len)
-{
-    return eppp_sdio_host_tx_generic(channel, buffer, len);
-}
-#endif
-
 static esp_err_t slave_reset(void)
 {
     esp_err_t ret = ESP_OK;
@@ -95,29 +81,7 @@ esp_err_t eppp_sdio_slave_rx(esp_netif_t *netif)
     if (ret == ESP_ERR_NOT_FINISHED || ret == ESP_OK) {
 again:
         ptr = sdio_slave_recv_get_buf(handle, &length);
-        struct header *head = (void *)ptr;
-        if (head->magic != PPP_SOF) {
-            ESP_LOGE(TAG, "invalid magic %x", head->magic);
-            return ESP_FAIL;
-        }
-        if (head->channel > NR_OF_CHANNELS) {
-            ESP_LOGE(TAG, "invalid channel %x", head->channel);
-            return ESP_FAIL;
-        }
-        if (head->size > SDIO_PAYLOAD || head->size > length) {
-            ESP_LOGE(TAG, "invalid size %x", head->size);
-            return ESP_FAIL;
-        }
-        if (head->channel == 0) {
-            esp_netif_receive(netif, ptr + sizeof(struct header), head->size, NULL);
-        } else {
-#if defined(CONFIG_EPPP_LINK_CHANNELS_SUPPORT)
-            struct eppp_handle *h = esp_netif_get_io_driver(netif);
-            if (h->channel_rx) {
-                h->channel_rx(netif, head->channel, ptr + sizeof(struct header), head->size);
-            }
-#endif
-        }
+        esp_netif_receive(netif, ptr, length, NULL);
         if (sdio_slave_recv_load_buf(handle) != ESP_OK) {
             ESP_LOGE(TAG, "Failed to recycle packet buffer");
             return ESP_FAIL;
@@ -145,7 +109,7 @@ static void event_cb(uint8_t pos)
     }
 }
 
-esp_err_t eppp_sdio_slave_init(struct eppp_config_sdio_s *eppp_config)
+esp_err_t eppp_sdio_slave_init(void)
 {
     sdio_slave_config_t config = {
         .sending_mode       = SDIO_SLAVE_SEND_PACKET,
@@ -202,7 +166,7 @@ void eppp_sdio_slave_deinit(void)
 {
 }
 
-esp_err_t eppp_sdio_slave_init(struct eppp_config_sdio_s *config)
+esp_err_t eppp_sdio_slave_init(void)
 {
     return ESP_ERR_NOT_SUPPORTED;
 }

components/eppp_link/eppp_spi.c

@@ -1,495 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <string.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include "sdkconfig.h"
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "esp_check.h"
-#include "esp_event.h"
-#include "esp_mac.h"
-#include "eppp_link.h"
-#include "eppp_transport.h"
-#include "eppp_transport_spi.h"
-#include "driver/spi_master.h"
-#include "driver/spi_slave.h"
-#include "driver/gpio.h"
-#include "esp_timer.h"
-#include "esp_rom_crc.h"
-
-#define TAG "eppp_spi"
-
-#define MAX_PAYLOAD 1500
-#define MIN_TRIGGER_US 20
-#define PPP_SOF 0x7E
-#define SPI_HEADER_MAGIC PPP_SOF
-#define SPI_ALIGN(size) (((size) + 3U) & ~(3U))
-#define TRANSFER_SIZE SPI_ALIGN((MAX_PAYLOAD + 6))
-#define NEXT_TRANSACTION_SIZE(a,b) (((a)>(b))?(a):(b)) /* next transaction: whichever is bigger */
-
-struct packet {
-    size_t len;
-    uint8_t *data;
-    int channel;
-};
-
-struct header {
-    uint8_t magic;
-    uint8_t channel;
-    uint16_t size;
-    uint16_t next_size;
-    uint16_t check;
-} __attribute__((packed));
-
-enum blocked_status {
-    NONE,
-    MASTER_BLOCKED,
-    MASTER_WANTS_READ,
-    SLAVE_BLOCKED,
-    SLAVE_WANTS_WRITE,
-};
-
-struct eppp_spi {
-    struct eppp_handle parent;
-    bool is_master;
-    QueueHandle_t out_queue;
-    QueueHandle_t ready_semaphore;
-    spi_device_handle_t spi_device;
-    spi_host_device_t spi_host;
-    int gpio_intr;
-    uint16_t next_size;
-    uint16_t transaction_size;
-    struct packet outbound;
-    enum blocked_status blocked;
-    uint32_t slave_last_edge;
-    esp_timer_handle_t timer;
-};
-
-static esp_err_t transmit_generic(struct eppp_spi *handle, int channel, void *buffer, size_t len)
-{
-
-    struct packet buf = { .channel = channel };
-    uint8_t *current_buffer = buffer;
-    size_t remaining = len;
-    do {    // TODO(IDF-9194): Refactor this loop to allocate only once and perform
-        //       fragmentation after receiving from the queue (applicable only if MTU > MAX_PAYLOAD)
-        size_t batch = remaining > MAX_PAYLOAD ? MAX_PAYLOAD : remaining;
-        buf.data = malloc(batch);
-        if (buf.data == NULL) {
-            ESP_LOGE(TAG, "Failed to allocate packet");
-            return ESP_ERR_NO_MEM;
-        }
-        buf.len = batch;
-        remaining -= batch;
-        memcpy(buf.data, current_buffer, batch);
-        current_buffer += batch;
-        BaseType_t ret = xQueueSend(handle->out_queue, &buf, 0);
-        if (ret != pdTRUE) {
-            ESP_LOGE(TAG, "Failed to queue packet to slave!");
-            return ESP_ERR_NO_MEM;
-        }
-    } while (remaining > 0);
-
-    if (!handle->is_master && handle->blocked == SLAVE_BLOCKED) {
-        uint32_t now = esp_timer_get_time();
-        uint32_t diff = now - handle->slave_last_edge;
-        if (diff < MIN_TRIGGER_US) {
-            esp_rom_delay_us(MIN_TRIGGER_US - diff);
-        }
-        gpio_set_level(handle->gpio_intr, 0);
-    }
-    return ESP_OK;
-}
-
-static esp_err_t transmit(void *h, void *buffer, size_t len)
-{
-    struct eppp_handle *handle = h;
-    struct eppp_spi *spi_handle = __containerof(handle, struct eppp_spi, parent);;
-    return transmit_generic(spi_handle, 0, buffer, len);
-}
-
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-static esp_err_t transmit_channel(esp_netif_t *netif, int channel, void *buffer, size_t len)
-{
-    struct eppp_handle *handle = esp_netif_get_io_driver(netif);
-    struct eppp_spi *spi_handle = __containerof(handle, struct eppp_spi, parent);;
-    return transmit_generic(spi_handle, channel, buffer, len);
-}
-#endif
-
-static void IRAM_ATTR timer_callback(void *arg)
-{
-    struct eppp_spi *h = arg;
-    if (h->blocked == SLAVE_WANTS_WRITE) {
-        gpio_set_level(h->gpio_intr, 0);
-    }
-}
-
-static void IRAM_ATTR gpio_isr_handler(void *arg)
-{
-    static uint32_t s_last_time;
-    uint32_t now = esp_timer_get_time();
-    uint32_t diff = now - s_last_time;
-    if (diff < MIN_TRIGGER_US) { // debounce
-        return;
-    }
-    s_last_time = now;
-    struct eppp_spi *h = arg;
-    BaseType_t yield = false;
-
-    // Positive edge means SPI slave prepared the data
-    if (gpio_get_level(h->gpio_intr) == 1) {
-        xSemaphoreGiveFromISR(h->ready_semaphore, &yield);
-        if (yield) {
-            portYIELD_FROM_ISR();
-        }
-        return;
-    }
-
-    // Negative edge (when master blocked) means that slave wants to transmit
-    if (h->blocked == MASTER_BLOCKED) {
-        struct packet buf = { .data = NULL, .len = -1 };
-        xQueueSendFromISR(h->out_queue, &buf, &yield);
-        if (yield) {
-            portYIELD_FROM_ISR();
-        }
-    }
-}
-
-static esp_err_t deinit_master(struct eppp_spi *h)
-{
-    ESP_RETURN_ON_ERROR(spi_bus_remove_device(h->spi_device), TAG, "Failed to remove SPI bus");
-    ESP_RETURN_ON_ERROR(spi_bus_free(h->spi_host), TAG, "Failed to free SPI bus");
-    return ESP_OK;
-}
-
-static esp_err_t init_master(struct eppp_config_spi_s *config, struct eppp_spi *h)
-{
-    esp_err_t ret = ESP_OK;
-    h->spi_host = config->host;
-    h->gpio_intr = config->intr;
-    spi_bus_config_t bus_cfg = {};
-    bus_cfg.mosi_io_num = config->mosi;
-    bus_cfg.miso_io_num = config->miso;
-    bus_cfg.sclk_io_num = config->sclk;
-    bus_cfg.quadwp_io_num = -1;
-    bus_cfg.quadhd_io_num = -1;
-    bus_cfg.max_transfer_sz = TRANSFER_SIZE;
-    bus_cfg.flags = 0;
-    bus_cfg.intr_flags = 0;
-
-    // TODO(IDF-13351): Init and deinit SPI bus separately (per Kconfig?)
-    ESP_RETURN_ON_ERROR(spi_bus_initialize(config->host, &bus_cfg, SPI_DMA_CH_AUTO), TAG, "Failed to init SPI bus");
-
-    spi_device_interface_config_t dev_cfg = {};
-    dev_cfg.clock_speed_hz = config->freq;
-    dev_cfg.mode = 0;
-    dev_cfg.spics_io_num = config->cs;
-    dev_cfg.cs_ena_pretrans = config->cs_ena_pretrans;
-    dev_cfg.cs_ena_posttrans = config->cs_ena_posttrans;
-    dev_cfg.duty_cycle_pos = 128;
-    dev_cfg.input_delay_ns = config->input_delay_ns;
-    dev_cfg.pre_cb = NULL;
-    dev_cfg.post_cb = NULL;
-    dev_cfg.queue_size = 3;
-
-    ESP_GOTO_ON_ERROR(spi_bus_add_device(config->host, &dev_cfg, &h->spi_device), err, TAG, "Failed to add SPI device");
-
-    //GPIO config for the handshake line.
-    gpio_config_t io_conf = {
-        .intr_type = GPIO_INTR_ANYEDGE,
-        .mode = GPIO_MODE_INPUT,
-        .pull_up_en = 1,
-        .pin_bit_mask = BIT64(config->intr),
-    };
-
-    ESP_GOTO_ON_ERROR(gpio_config(&io_conf), err_dev, TAG, "Failed to config interrupt GPIO");
-    ret = gpio_install_isr_service(0);
-    ESP_GOTO_ON_FALSE(ret == ESP_OK || ret == ESP_ERR_INVALID_STATE /* In case the GPIO ISR already installed */,
-                      ret, err_dev, TAG, "Failed to install GPIO ISR");
-    ESP_GOTO_ON_ERROR(gpio_set_intr_type(config->intr, GPIO_INTR_ANYEDGE), err_dev, TAG, "Failed to set ISR type");
-    ESP_GOTO_ON_ERROR(gpio_isr_handler_add(config->intr, gpio_isr_handler, h), err_dev, TAG, "Failed to add ISR handler");
-    return ESP_OK;
-err_dev:
-    spi_bus_remove_device(h->spi_device);
-err:
-    spi_bus_free(config->host);
-    return ret;
-}
-
-static void post_setup(spi_slave_transaction_t *trans)
-{
-    struct eppp_spi *h = trans->user;
-    h->slave_last_edge = esp_timer_get_time();
-    gpio_set_level(h->gpio_intr, 1);
-    if (h->transaction_size == 0) { // If no transaction planned:
-        if (h->outbound.len == 0) { // we're blocked if we don't have any data
-            h->blocked = SLAVE_BLOCKED;
-        } else {
-            h->blocked = SLAVE_WANTS_WRITE; // we notify the master that we want to write
-            esp_timer_start_once(h->timer, MIN_TRIGGER_US);
-        }
-    }
-}
-
-static void post_transaction(spi_slave_transaction_t *transaction)
-{
-    struct eppp_spi *h = transaction->user;
-    h->blocked = NONE;
-    gpio_set_level(h->gpio_intr, 0);
-}
-
-static esp_err_t deinit_slave(struct eppp_spi *h)
-{
-    ESP_RETURN_ON_ERROR(spi_slave_free(h->spi_host), TAG, "Failed to free SPI slave host");
-    ESP_RETURN_ON_ERROR(spi_bus_remove_device(h->spi_device), TAG, "Failed to remove SPI device");
-    ESP_RETURN_ON_ERROR(spi_bus_free(h->spi_host), TAG, "Failed to free SPI bus");
-    return ESP_OK;
-}
-
-static esp_err_t init_slave(struct eppp_config_spi_s *config, struct eppp_spi *h)
-{
-    h->spi_host = config->host;
-    h->gpio_intr = config->intr;
-    spi_bus_config_t bus_cfg = {};
-    bus_cfg.mosi_io_num = config->mosi;
-    bus_cfg.miso_io_num = config->miso;
-    bus_cfg.sclk_io_num = config->sclk;
-    bus_cfg.quadwp_io_num = -1;
-    bus_cfg.quadhd_io_num = -1;
-    bus_cfg.flags = 0;
-    bus_cfg.intr_flags = 0;
-
-    //Configuration for the SPI slave interface
-    spi_slave_interface_config_t slvcfg = {
-        .mode = 0,
-        .spics_io_num = config->cs,
-        .queue_size = 3,
-        .flags = 0,
-        .post_setup_cb = post_setup,
-        .post_trans_cb = post_transaction,
-    };
-
-    //Configuration for the handshake line
-    gpio_config_t io_conf = {
-        .intr_type = GPIO_INTR_DISABLE,
-        .mode = GPIO_MODE_OUTPUT,
-        .pin_bit_mask = BIT64(config->intr),
-    };
-
-    gpio_config(&io_conf);
-    gpio_set_pull_mode(config->mosi, GPIO_PULLUP_ONLY);
-    gpio_set_pull_mode(config->sclk, GPIO_PULLUP_ONLY);
-    gpio_set_pull_mode(config->cs, GPIO_PULLUP_ONLY);
-
-    //Initialize SPI slave interface
-    if (spi_slave_initialize(config->host, &bus_cfg, &slvcfg, SPI_DMA_CH_AUTO) != ESP_OK) {
-        return ESP_FAIL;
-    }
-    return ESP_OK;
-}
-
-typedef esp_err_t (*perform_transaction_t)(struct eppp_spi *h, size_t len, const void *tx_buffer, void *rx_buffer);
-
-static esp_err_t perform_transaction_master(struct eppp_spi *h, size_t len, const void *tx_buffer, void *rx_buffer)
-{
-    spi_transaction_t t = {};
-    t.length = len * 8;
-    t.tx_buffer = tx_buffer;
-    t.rx_buffer = rx_buffer;
-    return spi_device_transmit(h->spi_device, &t);
-}
-
-static esp_err_t perform_transaction_slave(struct eppp_spi *h, size_t len, const void *tx_buffer, void *rx_buffer)
-{
-    spi_slave_transaction_t t = {};
-    t.user = h;
-    t.length = len * 8;
-    t.tx_buffer = tx_buffer;
-    t.rx_buffer = rx_buffer;
-    return spi_slave_transmit(h->spi_host, &t, portMAX_DELAY);
-}
-
-esp_err_t eppp_perform(esp_netif_t *netif)
-{
-    static WORD_ALIGNED_ATTR uint8_t out_buf[TRANSFER_SIZE] = {};
-    static WORD_ALIGNED_ATTR uint8_t in_buf[TRANSFER_SIZE] = {};
-
-    struct eppp_handle *handle = esp_netif_get_io_driver(netif);
-    struct eppp_spi *h = __containerof(handle, struct eppp_spi, parent);
-
-    // Perform transaction for master and slave
-    const perform_transaction_t perform_transaction = h->is_master ? perform_transaction_master : perform_transaction_slave;
-
-    if (h->parent.stop) {
-        return ESP_ERR_TIMEOUT;
-    }
-
-    BaseType_t tx_queue_stat;
-    bool allow_test_tx = false;
-    uint16_t next_tx_size = 0;
-    if (h->is_master) {
-        // SPI MASTER only code
-        if (xSemaphoreTake(h->ready_semaphore, pdMS_TO_TICKS(1000)) != pdTRUE) {
-            // slave might not be ready, but maybe we just missed an interrupt
-            allow_test_tx = true;
-        }
-        if (h->outbound.len == 0 && h->transaction_size == 0 && h->blocked == NONE) {
-            h->blocked = MASTER_BLOCKED;
-            xQueueReceive(h->out_queue, &h->outbound, portMAX_DELAY);
-            h->blocked = NONE;
-            if (h->outbound.len == -1) {
-                h->outbound.len = 0;
-                h->blocked = MASTER_WANTS_READ;
-            }
-        } else if (h->blocked == MASTER_WANTS_READ) {
-            h->blocked = NONE;
-        }
-    }
-    struct header *head = (void *)out_buf;
-    if (h->outbound.len <= h->transaction_size && allow_test_tx == false) {
-        // sending outbound
-        head->size = h->outbound.len;
-        head->channel = h->outbound.channel;
-        if (h->outbound.len > 0) {
-            memcpy(out_buf + sizeof(struct header), h->outbound.data, h->outbound.len);
-            free(h->outbound.data);
-            ESP_LOG_BUFFER_HEXDUMP(TAG, out_buf + sizeof(struct header), head->size, ESP_LOG_VERBOSE);
-            h->outbound.data = NULL;
-            h->outbound.len = 0;
-        }
-        do {
-            tx_queue_stat = xQueueReceive(h->out_queue, &h->outbound, 0);
-        } while (tx_queue_stat == pdTRUE && h->outbound.len == -1);
-        if (h->outbound.len == -1) { // used as a signal only, no actual data
-            h->outbound.len = 0;
-        }
-    } else {
-        // outbound is bigger, need to transmit in another transaction (keep this empty)
-        head->size = 0;
-        head->channel = 0;
-    }
-    next_tx_size = head->next_size = h->outbound.len;
-    head->magic = SPI_HEADER_MAGIC;
-    head->check = esp_rom_crc16_le(0, out_buf, sizeof(struct header) - sizeof(uint16_t));
-    esp_err_t ret = perform_transaction(h, sizeof(struct header) + h->transaction_size, out_buf, in_buf);
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "spi_device_transmit failed");
-        h->transaction_size = 0; // need to start with HEADER only transaction
-        return ESP_FAIL;
-    }
-    head = (void *)in_buf;
-    uint16_t check = esp_rom_crc16_le(0, in_buf, sizeof(struct header) - sizeof(uint16_t));
-    if (check != head->check || head->magic != SPI_HEADER_MAGIC || head->channel > NR_OF_CHANNELS) {
-        h->transaction_size = 0; // need to start with HEADER only transaction
-        if (allow_test_tx) {
-            return ESP_OK;
-        }
-        ESP_LOGE(TAG, "Wrong checksum, magic, or channel: %x %x %x", check, head->magic, head->channel);
-        return ESP_FAIL;
-    }
-    if (head->size > 0) {
-        ESP_LOG_BUFFER_HEXDUMP(TAG, in_buf + sizeof(struct header), head->size, ESP_LOG_VERBOSE);
-        if (head->channel == 0) {
-            esp_netif_receive(netif, in_buf + sizeof(struct header), head->size, NULL);
-        } else {
-#if defined(CONFIG_EPPP_LINK_CHANNELS_SUPPORT)
-            if (h->parent.channel_rx) {
-                h->parent.channel_rx(netif, head->channel, in_buf + sizeof(struct header), head->size);
-            }
-#endif
-        }
-    }
-    h->transaction_size = NEXT_TRANSACTION_SIZE(next_tx_size, head->next_size);
-    return ESP_OK;
-}
-
-
-static esp_err_t init_driver(struct eppp_spi *h, struct eppp_config_spi_s *config)
-{
-    if (config->is_master) {
-        return init_master(config, h);
-    }
-    return init_slave(config, h);
-}
-
-static esp_err_t post_attach(esp_netif_t *esp_netif, void *args)
-{
-    eppp_transport_handle_t h = (eppp_transport_handle_t)args;
-    ESP_RETURN_ON_FALSE(h, ESP_ERR_INVALID_ARG, TAG, "Transport handle cannot be null");
-    h->base.netif = esp_netif;
-
-    esp_netif_driver_ifconfig_t driver_ifconfig = {
-        .handle =  h,
-        .transmit = transmit,
-    };
-
-    ESP_RETURN_ON_ERROR(esp_netif_set_driver_config(esp_netif, &driver_ifconfig), TAG, "Failed to set driver config");
-    ESP_LOGI(TAG, "EPPP SPI transport attached to EPPP netif %s", esp_netif_get_desc(esp_netif));
-    return ESP_OK;
-}
-
-
-eppp_transport_handle_t eppp_spi_init(struct eppp_config_spi_s *config)
-{
-    __attribute__((unused)) esp_err_t ret = ESP_OK;
-    ESP_RETURN_ON_FALSE(config, NULL, TAG, "Config cannot be null");
-    struct eppp_spi *h = calloc(1, sizeof(struct eppp_spi));
-    ESP_RETURN_ON_FALSE(h, NULL, TAG, "Failed to allocate eppp_handle");
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-    h->parent.channel_tx = transmit_channel;
-#endif
-    h->is_master = config->is_master;
-    h->parent.base.post_attach = post_attach;
-    h->out_queue = xQueueCreate(CONFIG_EPPP_LINK_PACKET_QUEUE_SIZE, sizeof(struct packet));
-    ESP_GOTO_ON_FALSE(h->out_queue, ESP_FAIL, err, TAG, "Failed to create the packet queue");
-    if (h->is_master) {
-        ESP_GOTO_ON_FALSE(h->ready_semaphore = xSemaphoreCreateBinary(), ESP_FAIL, err, TAG, "Failed to create the semaphore");
-    }
-    h->transaction_size = 0;
-    h->outbound.data = NULL;
-    h->outbound.len = 0;
-    if (!h->is_master) {
-        esp_timer_create_args_t args = {
-            .callback = &timer_callback,
-            .arg = h,
-            .name = "spi_slave_tmr"
-        };
-        ESP_GOTO_ON_ERROR(esp_timer_create(&args, &h->timer), err, TAG, "Failed to create timer");
-    }
-    ESP_GOTO_ON_ERROR(init_driver(h, config), err, TAG, "Failed to init SPI driver");
-    return &h->parent;
-err:
-    if (h->out_queue) {
-        vQueueDelete(h->out_queue);
-    }
-    if (h->ready_semaphore) {
-        vSemaphoreDelete(h->ready_semaphore);
-    }
-    free(h);
-    return NULL;
-}
-void eppp_spi_deinit(eppp_transport_handle_t handle)
-{
-    struct eppp_spi *h = __containerof(handle, struct eppp_spi, parent);;
-    if (h->is_master) {
-        deinit_master(h);
-    } else {
-        deinit_slave(h);
-    }
-    struct packet buf = { };
-    while (xQueueReceive(h->out_queue, &buf, 0) == pdTRUE) {
-        if (buf.len > 0) {
-            free(buf.data);
-        }
-    }
-    vQueueDelete(h->out_queue);
-    if (h->is_master) {
-        vSemaphoreDelete(h->ready_semaphore);
-    }
-    free(h);
-}

components/eppp_link/eppp_transport.h

@@ -1,29 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#pragma once
-#include "esp_netif_types.h"
-#include "sdkconfig.h"
-
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-#define NR_OF_CHANNELS CONFIG_EPPP_LINK_NR_OF_CHANNELS
-#else
-#define NR_OF_CHANNELS 1
-#endif
-
-struct eppp_handle {
-    esp_netif_driver_base_t base;
-    eppp_type_t role;
-    bool stop;
-    bool exited;
-    bool netif_stop;
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-    eppp_channel_fn_t channel_tx;
-    eppp_channel_fn_t channel_rx;
-    void* context;
-#endif
-};
-
-esp_err_t eppp_check_connection(esp_netif_t *netif);

components/eppp_link/eppp_uart.c

@@ -1,283 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include <string.h>
-#include <stdint.h>
-#include "sdkconfig.h"
-#include "esp_log.h"
-#include "esp_netif.h"
-#include "esp_check.h"
-#include "esp_event.h"
-#include "eppp_link.h"
-#include "eppp_transport.h"
-#include "driver/uart.h"
-
-#define TAG "eppp_uart"
-
-struct eppp_uart {
-    struct eppp_handle parent;
-    QueueHandle_t uart_event_queue;
-    uart_port_t uart_port;
-};
-
-#define MAX_PAYLOAD (1500)
-#define HEADER_MAGIC (0x7E)
-#define HEADER_SIZE (4)
-#define MAX_PACKET_SIZE (MAX_PAYLOAD + HEADER_SIZE)
-/* Maximum size of a packet sent over UART, including header and payload */
-#define UART_BUF_SIZE   (MAX_PACKET_SIZE)
-
-struct header {
-    uint8_t magic;
-    uint8_t channel;
-    uint8_t check;
-    uint16_t size;
-} __attribute__((packed));
-
-static esp_err_t transmit_generic(struct eppp_uart *handle, int channel, void *buffer, size_t len)
-{
-#ifndef CONFIG_EPPP_LINK_USES_PPP
-    static uint8_t out_buf[MAX_PACKET_SIZE] = {};
-    struct header *head = (void *)out_buf;
-    head->magic = HEADER_MAGIC;
-    head->check = 0;
-    head->channel = channel;
-    head->size = len;
-    head->check = (0xFF & len) ^ (len >> 8);
-    memcpy(out_buf + sizeof(struct header), buffer, len);
-    ESP_LOG_BUFFER_HEXDUMP("ppp_uart_send", out_buf, len + sizeof(struct header), ESP_LOG_DEBUG);
-    uart_write_bytes(handle->uart_port, out_buf, len + sizeof(struct header));
-#else
-    ESP_LOG_BUFFER_HEXDUMP("ppp_uart_send", buffer, len, ESP_LOG_DEBUG);
-    uart_write_bytes(handle->uart_port, buffer, len);
-#endif
-    return ESP_OK;
-}
-
-static esp_err_t transmit(void *h, void *buffer, size_t len)
-{
-    struct eppp_handle *handle = h;
-    struct eppp_uart *uart_handle = __containerof(handle, struct eppp_uart, parent);
-    return transmit_generic(uart_handle, 0, buffer, len);
-}
-
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-static esp_err_t transmit_channel(esp_netif_t *netif, int channel, void *buffer, size_t len)
-{
-    struct eppp_handle *handle = esp_netif_get_io_driver(netif);
-    struct eppp_uart *uart_handle = __containerof(handle, struct eppp_uart, parent);
-    return transmit_generic(uart_handle, channel, buffer, len);
-}
-#endif
-
-static esp_err_t init_uart(struct eppp_uart *h, struct eppp_config_uart_s *config)
-{
-    h->uart_port = config->port;
-    uart_config_t uart_config = {};
-    uart_config.baud_rate = config->baud;
-    uart_config.data_bits = UART_DATA_8_BITS;
-    uart_config.parity    = UART_PARITY_DISABLE;
-    uart_config.stop_bits = UART_STOP_BITS_1;
-    uart_config.flow_ctrl = config->flow_control;
-    uart_config.source_clk = UART_SCLK_DEFAULT;
-
-    ESP_RETURN_ON_ERROR(uart_driver_install(h->uart_port, config->rx_buffer_size, 0, config->queue_size, &h->uart_event_queue, 0), TAG, "Failed to install UART");
-    ESP_RETURN_ON_ERROR(uart_param_config(h->uart_port, &uart_config), TAG, "Failed to set params");
-    ESP_RETURN_ON_ERROR(uart_set_pin(h->uart_port, config->tx_io, config->rx_io, config->rts_io, config->cts_io), TAG, "Failed to set UART pins");
-    ESP_RETURN_ON_ERROR(uart_set_rx_timeout(h->uart_port, 1), TAG, "Failed to set UART Rx timeout");
-    return ESP_OK;
-}
-
-static void deinit_uart(struct eppp_uart *h)
-{
-    uart_driver_delete(h->uart_port);
-}
-
-#ifndef CONFIG_EPPP_LINK_USES_PPP
-/**
- * @brief Process incoming UART data and extract packets
- */
-static void process_packet(esp_netif_t *netif, uart_port_t uart_port, size_t available_data)
-{
-    static uint8_t in_buf[2 * UART_BUF_SIZE] = {};
-    static size_t buf_start = 0;
-    static size_t buf_end = 0;
-    struct header *head;
-
-    // Read data directly into our buffer
-    size_t available_space = sizeof(in_buf) - buf_end;
-    size_t read_size = (available_data < available_space) ? available_data : available_space;
-    if (read_size > 0) {
-        size_t len = uart_read_bytes(uart_port, in_buf + buf_end, read_size, 0);
-        ESP_LOG_BUFFER_HEXDUMP("ppp_uart_recv", in_buf + buf_end, len, ESP_LOG_DEBUG);
-
-        if (buf_end + len <= sizeof(in_buf)) {
-            buf_end += len;
-        } else {
-            ESP_LOGW(TAG, "Buffer overflow, discarding data");
-            buf_start = buf_end = 0;
-            return;
-        }
-    }
-
-    // Process while we have enough data for at least a header
-    while ((buf_end - buf_start) >= sizeof(struct header)) {
-        head = (void *)(in_buf + buf_start);
-
-        if (head->magic != HEADER_MAGIC) {
-            goto recover;
-        }
-
-        uint8_t calculated_check = (head->size & 0xFF) ^ (head->size >> 8);
-        if (head->check != calculated_check) {
-            ESP_LOGW(TAG, "Checksum mismatch: expected 0x%04x, got 0x%04x", calculated_check, head->check);
-            goto recover;
-        }
-
-        // Check if we have the complete packet
-        uint16_t payload_size = head->size;
-        int channel = head->channel;
-        size_t total_packet_size = sizeof(struct header) + payload_size;
-
-        if (payload_size > MAX_PAYLOAD) {
-            ESP_LOGW(TAG, "Invalid payload size: %d", payload_size);
-            goto recover;
-        }
-
-        // If we don't have the complete packet yet, wait for more data
-        if ((buf_end - buf_start) < total_packet_size) {
-            ESP_LOGD(TAG, "Incomplete packet: got %d bytes, need %d bytes", (buf_end - buf_start), total_packet_size);
-            break;
-        }
-
-        // Got a complete packet, pass it to network
-        if (channel == 0) {
-            esp_netif_receive(netif, in_buf + buf_start + sizeof(struct header), payload_size, NULL);
-        } else {
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-            struct eppp_handle *handle = esp_netif_get_io_driver(netif);
-            struct eppp_uart *h = __containerof(handle, struct eppp_uart, parent);
-            if (h->parent.channel_rx) {
-                h->parent.channel_rx(netif, channel, in_buf + buf_start + sizeof(struct header), payload_size);
-            }
-#endif
-        }
-
-        // Advance start pointer past this packet
-        buf_start += total_packet_size;
-
-        // compact if we don't have enough space for 1x UART_BUF_SIZE
-        if (buf_start > (sizeof(in_buf) / 2) || (sizeof(in_buf) - buf_end) < UART_BUF_SIZE) {
-            if (buf_start < buf_end) {
-                size_t remaining_data = buf_end - buf_start;
-                memmove(in_buf, in_buf + buf_start, remaining_data);
-                buf_end = remaining_data;
-            } else {
-                buf_end = 0;
-            }
-            buf_start = 0;
-        }
-
-        continue;
-
-recover:
-        // Search for next HEADER_MAGIC occurrence
-        uint8_t *next_magic = memchr(in_buf + buf_start + 1, HEADER_MAGIC, buf_end - buf_start - 1);
-        if (next_magic) {
-            // Found next potential header, advance start to that position
-            buf_start = next_magic - in_buf;
-
-            // Check if we need to compact after recovery too
-            if (buf_start > (sizeof(in_buf) / 2) || (sizeof(in_buf) - buf_end) < UART_BUF_SIZE) {
-                if (buf_start < buf_end) {
-                    size_t remaining_data = buf_end - buf_start;
-                    memmove(in_buf, in_buf + buf_start, remaining_data);
-                    buf_end = remaining_data;
-                } else {
-                    buf_end = 0;
-                }
-                buf_start = 0;
-            }
-        } else {
-            // No more HEADER_MAGIC found, discard all data
-            buf_start = buf_end = 0;
-        }
-    }
-}
-#endif
-
-esp_err_t eppp_perform(esp_netif_t *netif)
-{
-    struct eppp_handle *handle = esp_netif_get_io_driver(netif);
-    struct eppp_uart *h = __containerof(handle, struct eppp_uart, parent);
-
-    uart_event_t event = {};
-    if (h->parent.stop) {
-        return ESP_ERR_TIMEOUT;
-    }
-
-    if (xQueueReceive(h->uart_event_queue, &event, pdMS_TO_TICKS(100)) != pdTRUE) {
-        return ESP_OK;
-    }
-    if (event.type == UART_DATA) {
-        size_t len;
-        uart_get_buffered_data_len(h->uart_port, &len);
-        if (len) {
-#ifdef CONFIG_EPPP_LINK_USES_PPP
-            static uint8_t buffer[UART_BUF_SIZE] = {};
-            len = uart_read_bytes(h->uart_port, buffer, UART_BUF_SIZE, 0);
-            ESP_LOG_BUFFER_HEXDUMP("ppp_uart_recv", buffer, len, ESP_LOG_DEBUG);
-            esp_netif_receive(netif, buffer, len, NULL);
-#else
-            // Read directly in process_packet to save one buffer
-            process_packet(netif, h->uart_port, len);
-#endif
-        }
-    } else {
-        ESP_LOGW(TAG, "Received UART event: %d", event.type);
-    }
-    return ESP_OK;
-}
-
-
-static esp_err_t post_attach(esp_netif_t *esp_netif, void *args)
-{
-    eppp_transport_handle_t h = (eppp_transport_handle_t)args;
-    ESP_RETURN_ON_FALSE(h, ESP_ERR_INVALID_ARG, TAG, "Transport handle cannot be null");
-    h->base.netif = esp_netif;
-
-    esp_netif_driver_ifconfig_t driver_ifconfig = {
-        .handle =  h,
-        .transmit = transmit,
-    };
-
-    ESP_RETURN_ON_ERROR(esp_netif_set_driver_config(esp_netif, &driver_ifconfig), TAG, "Failed to set driver config");
-    ESP_LOGI(TAG, "EPPP UART transport attached to EPPP netif %s", esp_netif_get_desc(esp_netif));
-    return ESP_OK;
-}
-
-eppp_transport_handle_t eppp_uart_init(struct eppp_config_uart_s *config)
-{
-    __attribute__((unused)) esp_err_t ret = ESP_OK;
-    ESP_RETURN_ON_FALSE(config, NULL, TAG, "Config cannot be null");
-    struct eppp_uart *h = calloc(1, sizeof(struct eppp_uart));
-    ESP_RETURN_ON_FALSE(h, NULL, TAG, "Failed to allocate eppp_handle");
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-    h->parent.channel_tx = transmit_channel;
-#endif
-    h->parent.base.post_attach = post_attach;
-    ESP_GOTO_ON_ERROR(init_uart(h, config), err, TAG, "Failed to init UART");
-    return &h->parent;
-err:
-    free(h);
-    return NULL;
-}
-
-void eppp_uart_deinit(eppp_transport_handle_t handle)
-{
-    struct eppp_uart *h = __containerof(handle, struct eppp_uart, parent);
-    deinit_uart(h);
-    free(h);
-}

components/eppp_link/examples/host/main/CMakeLists.txt

@@ -1,6 +1,2 @@
-if(CONFIG_EXAMPLE_WIFI_OVER_EPPP_CHANNEL)
-    set(wifi_over_channels channel_wifi_station.c)
-endif()
 idf_component_register(SRCS app_main.c register_iperf.c
-                            ${wifi_over_channels}
-                       INCLUDE_DIRS ".")
+                    INCLUDE_DIRS ".")

components/eppp_link/examples/host/main/Kconfig.projbuild

@@ -26,66 +26,10 @@ menu "Example Configuration"
         help
             Init and run iperf console.
 
-    config EXAMPLE_SPI_HOST
-        int "SPI Host"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 1
-        range 0 2
-        help
-            SPI host to use (SPI1_HOST=0, SPI2_HOST=1, SPI3_HOST=2).
-
-    config EXAMPLE_SPI_MOSI_PIN
-        int "MOSI Pin Number"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 23
-        range 0 39
-        help
-            Pin number of SPI MOSI.
-
-    config EXAMPLE_SPI_MISO_PIN
-        int "MISO Pin Number"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 19
-        range 0 39
-        help
-            Pin number of SPI MISO.
-
-    config EXAMPLE_SPI_SCLK_PIN
-        int "SCLK Pin Number"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 18
-        range 0 39
-        help
-            Pin number of SPI SCLK.
-
-    config EXAMPLE_SPI_CS_PIN
-        int "CS Pin Number"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 5
-        range 0 39
-        help
-            Pin number of SPI CS.
-
-    config EXAMPLE_SPI_INTR_PIN
-        int "Interrupt Pin Number"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 17
-        range 0 39
-        help
-            Pin number of SPI interrupt.
-
-    config EXAMPLE_SPI_FREQUENCY
-        int "SPI Frequency (Hz)"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 4000000
-        range 100000 80000000
-        help
-            SPI frequency in Hz.
-
     config EXAMPLE_UART_TX_PIN
         int "TXD Pin Number"
         depends on EPPP_LINK_DEVICE_UART
-        default 17
+        default 10
         range 0 31
         help
             Pin number of UART TX.
@@ -93,7 +37,7 @@ menu "Example Configuration"
     config EXAMPLE_UART_RX_PIN
         int "RXD Pin Number"
         depends on EPPP_LINK_DEVICE_UART
-        default 18
+        default 11
         range 0 31
         help
             Pin number of UART RX.
@@ -101,19 +45,9 @@ menu "Example Configuration"
     config EXAMPLE_UART_BAUDRATE
         int "Baudrate"
         depends on EPPP_LINK_DEVICE_UART
-        default 921600
+        default 2000000
         range 0 4000000
         help
             Baudrate used by the PPP over UART
 
-    config EXAMPLE_WIFI_OVER_EPPP_CHANNEL
-        bool "Use WiFi over EPPP channel"
-        default n
-        depends on EPPP_LINK_CHANNELS_SUPPORT && ESP_WIFI_REMOTE_ENABLED
-        help
-            Enable this option to use WiFi over EPPP channel.
-            If this option is enabled, the example will only start the Wi-Fi driver,
-            but the Wi-Fi netif will reside on client's end and will channel
-            the Rx and Tx data via EPPP channels.
-
 endmenu

components/eppp_link/examples/host/main/app_main.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -14,7 +14,6 @@
 #include "esp_netif.h"
 #include "eppp_link.h"
 #include "esp_log.h"
-#include "esp_check.h"
 #include "mqtt_client.h"
 #include "console_ping.h"
 
@@ -89,7 +88,6 @@ static void mqtt_app_start(void)
 }
 #endif // MQTT
 
-void station_over_eppp_channel(void *arg);
 
 void app_main(void)
 {
@@ -106,24 +104,13 @@ void app_main(void)
     eppp_config_t config = EPPP_DEFAULT_CLIENT_CONFIG();
 #if CONFIG_EPPP_LINK_DEVICE_SPI
     config.transport = EPPP_TRANSPORT_SPI;
-    config.spi.is_master = true;
-    config.spi.host = CONFIG_EXAMPLE_SPI_HOST;
-    config.spi.mosi = CONFIG_EXAMPLE_SPI_MOSI_PIN;
-    config.spi.miso = CONFIG_EXAMPLE_SPI_MISO_PIN;
-    config.spi.sclk = CONFIG_EXAMPLE_SPI_SCLK_PIN;
-    config.spi.cs = CONFIG_EXAMPLE_SPI_CS_PIN;
-    config.spi.intr = CONFIG_EXAMPLE_SPI_INTR_PIN;
-    config.spi.freq = CONFIG_EXAMPLE_SPI_FREQUENCY;
 #elif CONFIG_EPPP_LINK_DEVICE_UART
     config.transport = EPPP_TRANSPORT_UART;
     config.uart.tx_io = CONFIG_EXAMPLE_UART_TX_PIN;
     config.uart.rx_io = CONFIG_EXAMPLE_UART_RX_PIN;
     config.uart.baud = CONFIG_EXAMPLE_UART_BAUDRATE;
-#elif CONFIG_EPPP_LINK_DEVICE_ETH
-    config.transport = EPPP_TRANSPORT_ETHERNET;
 #else
     config.transport = EPPP_TRANSPORT_SDIO;
-    config.sdio.is_host = true;
 #endif
     esp_netif_t *eppp_netif = eppp_connect(&config);
     if (eppp_netif == NULL) {
@@ -158,9 +145,6 @@ void app_main(void)
     // start console REPL
     ESP_ERROR_CHECK(console_cmd_start());
 
-#ifdef CONFIG_EXAMPLE_WIFI_OVER_EPPP_CHANNEL
-    station_over_eppp_channel(eppp_netif);
-#endif
 #if CONFIG_EXAMPLE_MQTT
     mqtt_app_start();
 #endif

components/eppp_link/examples/host/main/channel_wifi_station.c

@@ -1,185 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Unlicense OR CC0-1.0
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <string.h>
-#include "esp_system.h"
-#include "esp_event.h"
-#include "esp_netif.h"
-#include "eppp_link.h"
-#include "esp_log.h"
-#include "esp_check.h"
-#include "esp_wifi_remote.h"
-
-#define CHAT_CHANNEL 1
-#define WIFI_CHANNEL 2
-
-typedef enum {
-    UNKNOWN,
-    HELLO,
-    START,
-    ERROR,
-} state_t;
-
-typedef struct context {
-    eppp_channel_fn_t transmit;
-    EventGroupHandle_t flags;
-    state_t state;
-    esp_netif_t *eppp;
-} context_t;
-
-#define HELLO_BIT BIT0
-#define START_BIT BIT1
-#define CONNECT_BIT BIT2
-#define SERVER_UP_BIT BIT3
-
-#define ALL_BITS (HELLO_BIT | START_BIT | CONNECT_BIT | SERVER_UP_BIT)
-
-static uint8_t s_wifi_mac_addr[6] = { 0 };
-static const char *TAG = "eppp_host_example_with_channels";
-
-esp_netif_t* esp_wifi_remote_create_default_sta(void);
-
-static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data)
-{
-    ESP_LOGI(TAG, "IP event_handler: event_base=%s event_id=%d", event_base, event_id);
-    if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
-        ip_event_got_ip_t *event = (ip_event_got_ip_t *) event_data;
-        ESP_LOGI(TAG, "Got IP:" IPSTR, IP2STR(&event->ip_info.ip));
-    }
-}
-
-esp_err_t esp_wifi_remote_get_mac(wifi_interface_t ifx, uint8_t mac[6])
-{
-    if (ifx != WIFI_IF_STA) {
-        return ESP_ERR_INVALID_STATE;
-
-    }
-    for (int i = 0; i < sizeof(s_wifi_mac_addr); i++) {
-        if (s_wifi_mac_addr[i] == 0) {
-            return ESP_ERR_INVALID_STATE;
-        }
-    }
-    memcpy(mac, s_wifi_mac_addr, sizeof(s_wifi_mac_addr));
-    return ESP_OK;
-}
-
-static esp_err_t eppp_receive(esp_netif_t *netif, int nr, void *buffer, size_t len)
-{
-    context_t *ctx = eppp_get_context(netif);
-    if (nr == CHAT_CHANNEL) {
-        ESP_LOGI(TAG, "Received channel=%d len=%d %.*s", nr, (int)len, (int)len, (char *)buffer);
-        const char hello[] = "Hello client";
-        const char mac[] = "MAC: ";
-        const char connected[] = "Connected";
-        const char server_up[] = "Server up";
-        size_t mac_len = 5 /* MAC: */ + 6 * 2 /* 6 bytes per char */ + 5 /* : */ + 1 /* \0 */;
-        if (len == sizeof(server_up) && memcmp(buffer, server_up, len) == 0) {
-            if (ctx->state == UNKNOWN) {
-                ESP_LOGI(TAG, "Server is up");
-                ctx->state = HELLO;
-            } else {
-                ESP_LOGE(TAG, "Received server up in unexpected state %d", ctx->state);
-                ctx->state = ERROR;
-            }
-            xEventGroupSetBits(ctx->flags, SERVER_UP_BIT);
-        } else if (len == sizeof(hello) && memcmp(buffer, hello, len) == 0) {
-            if (ctx->state == HELLO) {
-                xEventGroupSetBits(ctx->flags, HELLO_BIT);
-            } else {
-                ESP_LOGE(TAG, "Received hello in unexpected state %d", ctx->state);
-                ctx->state = ERROR;
-            }
-        } else if (len == mac_len && memcmp(buffer, mac, 5) == 0) {
-            if (ctx->state == HELLO) {
-                uint8_t mac_addr[6];
-                sscanf((char *)buffer + 5, "%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8 ":%2" PRIx8,
-                       &mac_addr[0], &mac_addr[1], &mac_addr[2], &mac_addr[3], &mac_addr[4], &mac_addr[5]);
-                ESP_LOGI(TAG, "Parsed MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]);
-                memcpy(s_wifi_mac_addr, mac_addr, sizeof(s_wifi_mac_addr));
-                xEventGroupSetBits(ctx->flags, START_BIT);
-            } else {
-                ESP_LOGE(TAG, "Received MAC in unexpected state %d", ctx->state);
-                ctx->state = ERROR;
-            }
-        } else if (len == sizeof(connected) && memcmp(buffer, connected, len) == 0) {
-            if (ctx->state == START) {
-                xEventGroupSetBits(ctx->flags, CONNECT_BIT);
-            } else {
-                ESP_LOGE(TAG, "Received connected in unexpected state %d", ctx->state);
-                ctx->state = ERROR;
-            }
-        }
-    } else if (nr == WIFI_CHANNEL) {
-        ESP_LOGD(TAG, "Received WIFI channel=%d len=%d", nr, (int)len);
-        ESP_LOG_BUFFER_HEXDUMP("wifi-receive", buffer, len, ESP_LOG_VERBOSE);
-        return esp_wifi_remote_channel_rx(ctx->eppp, buffer, NULL, len);
-    } else {
-        ESP_LOGE(TAG, "Incorrect channel number %d", nr);
-        return ESP_FAIL;
-    }
-    return ESP_OK;
-}
-
-static esp_err_t wifi_transmit(void *h, void *buffer, size_t len)
-{
-    esp_netif_t *eppp = (esp_netif_t *)h;
-    context_t *ctx = eppp_get_context(eppp);
-    ESP_LOG_BUFFER_HEXDUMP("wifi-transmit", buffer, len, ESP_LOG_VERBOSE);
-    return ctx->transmit(eppp, WIFI_CHANNEL, buffer, len);
-}
-
-void esp_netif_destroy_wifi_remote(void *esp_netif);
-
-void station_over_eppp_channel(void *arg)
-{
-    __attribute__((unused)) esp_err_t ret;
-    esp_netif_t *wifi = NULL;
-    context_t ctx = {
-        .transmit = NULL,
-        .flags = NULL,
-        .state = UNKNOWN,
-        .eppp = (esp_netif_t *)arg
-    };
-    ESP_GOTO_ON_FALSE(ctx.eppp != NULL, ESP_FAIL, err, TAG, "Incorrect EPPP netif");
-    ESP_GOTO_ON_FALSE(ctx.flags = xEventGroupCreate(), ESP_FAIL, err, TAG, "Failed to create event group");
-    ESP_GOTO_ON_ERROR(eppp_add_channels(ctx.eppp, &ctx.transmit, eppp_receive, &ctx), err, TAG, "Failed to add channels");
-    ESP_GOTO_ON_FALSE(ctx.transmit, ESP_FAIL, err, TAG, "Channel tx function is not set");
-    ESP_GOTO_ON_ERROR(esp_wifi_remote_channel_set(WIFI_IF_STA, ctx.eppp, wifi_transmit), err, TAG, "Failed to set wifi channel tx function");
-    esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, event_handler, &ctx);
-
-    while (1) {
-        EventBits_t bits = xEventGroupWaitBits(ctx.flags, ALL_BITS, pdTRUE, pdFALSE, pdMS_TO_TICKS(1000));
-        if (bits & HELLO_BIT) {
-            ESP_LOGI(TAG, "Hello done");
-            if (wifi == NULL) {
-                wifi = esp_wifi_remote_create_default_sta();
-            }
-            const char command[] = "Get MAC";
-            ctx.transmit(ctx.eppp, CHAT_CHANNEL, (void*)command, sizeof(command));
-        } else if (bits & START_BIT) {
-            ctx.state = START;
-            ESP_LOGI(TAG, "Starting WIFI");
-            esp_event_post(WIFI_REMOTE_EVENT, WIFI_EVENT_STA_START, NULL, 0, 0);
-        } else if (bits & CONNECT_BIT) {
-            ESP_LOGI(TAG, "WIFI connected");
-            esp_event_post(WIFI_REMOTE_EVENT, WIFI_EVENT_STA_CONNECTED, NULL, 0, 0);
-        } else if ((bits & SERVER_UP_BIT) == SERVER_UP_BIT || ctx.state != START)  {
-            if (ctx.state == ERROR) {
-                esp_netif_destroy_wifi_remote(wifi);
-                wifi = NULL;
-                ESP_LOGI(TAG, "WiFi netif has been destroyed");
-            }
-            const char hello[] = "Hello server";
-            ctx.transmit(ctx.eppp, CHAT_CHANNEL, (void*)hello, sizeof(hello));
-            ctx.state = HELLO;
-        }
-    }
-
-err:
-    vTaskDelete(NULL);
-}

components/eppp_link/examples/host/main/idf_component.yml

@@ -1,11 +1,7 @@
 dependencies:
-  espressif/iperf-cmd: ^0.1.1
+  espressif/iperf-cmd: "^0.1.1"
   espressif/eppp_link:
-    version: '*'
-    override_path: ../../..
+    version: "*"
+    override_path: "../../.."
   console_cmd_ping:
-    version: '*'
-  espressif/mqtt:
-    rules:
-    - if: idf_version >=6.0
-      version: ^1.0.0
+    version: "*"

components/eppp_link/examples/host/sdkconfig.ci.1

@@ -1,4 +0,0 @@
-CONFIG_IDF_TARGET="esp32s3"
-CONFIG_EPPP_LINK_DEVICE_SPI=y
-CONFIG_EPPP_LINK_CHANNELS_SUPPORT=y
-CONFIG_EPPP_LINK_USES_PPP=y

components/eppp_link/examples/host/sdkconfig.ci.2

@@ -1,3 +0,0 @@
-CONFIG_IDF_TARGET="esp32c3"
-CONFIG_EPPP_LINK_DEVICE_UART=y
-CONFIG_EPPP_LINK_CHANNELS_SUPPORT=y

components/eppp_link/examples/host/sdkconfig.ci.eth

@@ -1,2 +0,0 @@
-CONFIG_IDF_TARGET="esp32"
-CONFIG_EPPP_LINK_DEVICE_ETH=y

components/eppp_link/examples/host/sdkconfig.ci.sdio

@@ -1,2 +0,0 @@
-CONFIG_IDF_TARGET="esp32p4"
-CONFIG_EPPP_LINK_DEVICE_SDIO=y

components/eppp_link/examples/host/sdkconfig.defaults

@@ -1 +1,4 @@
+CONFIG_LWIP_PPP_SUPPORT=y
+CONFIG_LWIP_PPP_SERVER_SUPPORT=y
 CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n
+CONFIG_LWIP_PPP_DEBUG_ON=y

components/eppp_link/examples/slave/main/CMakeLists.txt

@@ -1,6 +1,2 @@
-if(CONFIG_EXAMPLE_WIFI_OVER_EPPP_CHANNEL)
-    set(wifi_over_channels channel_wifi_station.c)
-endif()
-idf_component_register(SRCS eppp_slave.c
-                            ${wifi_over_channels}
-                       INCLUDE_DIRS ".")
+idf_component_register(SRCS "eppp_slave.c"
+                    INCLUDE_DIRS ".")

components/eppp_link/examples/slave/main/Kconfig.projbuild

@@ -18,66 +18,10 @@ menu "Example Configuration"
         help
             Set the Maximum retry to avoid station reconnecting to the AP unlimited when the AP is really inexistent.
 
-    config EXAMPLE_SPI_HOST
-        int "SPI Host"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 1
-        range 0 2
-        help
-            SPI host to use (SPI1_HOST=0, SPI2_HOST=1, SPI3_HOST=2).
-
-    config EXAMPLE_SPI_MOSI_PIN
-        int "MOSI Pin Number"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 23
-        range 0 39
-        help
-            Pin number of SPI MOSI.
-
-    config EXAMPLE_SPI_MISO_PIN
-        int "MISO Pin Number"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 19
-        range 0 39
-        help
-            Pin number of SPI MISO.
-
-    config EXAMPLE_SPI_SCLK_PIN
-        int "SCLK Pin Number"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 18
-        range 0 39
-        help
-            Pin number of SPI SCLK.
-
-    config EXAMPLE_SPI_CS_PIN
-        int "CS Pin Number"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 5
-        range 0 39
-        help
-            Pin number of SPI CS.
-
-    config EXAMPLE_SPI_INTR_PIN
-        int "Interrupt Pin Number"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 17
-        range 0 39
-        help
-            Pin number of SPI interrupt.
-
-    config EXAMPLE_SPI_FREQUENCY
-        int "SPI Frequency (Hz)"
-        depends on EPPP_LINK_DEVICE_SPI
-        default 1000000
-        range 100000 80000000
-        help
-            SPI frequency in Hz.
-
     config EXAMPLE_UART_TX_PIN
         int "TXD Pin Number"
         depends on EPPP_LINK_DEVICE_UART
-        default 18
+        default 11
         range 0 31
         help
             Pin number of UART TX.
@@ -85,7 +29,7 @@ menu "Example Configuration"
     config EXAMPLE_UART_RX_PIN
         int "RXD Pin Number"
         depends on EPPP_LINK_DEVICE_UART
-        default 17
+        default 10
         range 0 31
         help
             Pin number of UART RX.
@@ -93,19 +37,9 @@ menu "Example Configuration"
     config EXAMPLE_UART_BAUDRATE
         int "Baudrate"
         depends on EPPP_LINK_DEVICE_UART
-        default 921600
+        default 2000000
         range 0 4000000
         help
             Baudrate used by the PPP over UART
 
-    config EXAMPLE_WIFI_OVER_EPPP_CHANNEL
-        bool "Use WiFi over EPPP channel"
-        default n
-        depends on EPPP_LINK_CHANNELS_SUPPORT
-        help
-            Enable this option to use WiFi over EPPP channel.
-            If this option is enabled, the example will only start the Wi-Fi driver,
-            but the Wi-Fi netif will reside on client's end and will channel
-            the Rx and Tx data via EPPP channels.
-
 endmenu

components/eppp_link/examples/slave/main/channel_wifi_station.c

@@ -1,169 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Unlicense OR CC0-1.0
- */
-#include <stdio.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <string.h>
-#include "esp_system.h"
-#include "esp_event.h"
-#include "esp_netif.h"
-#include "eppp_link.h"
-#include "esp_log.h"
-#include "esp_check.h"
-#include "esp_private/wifi.h"
-
-#define CHAT_CHANNEL 1
-#define WIFI_CHANNEL 2
-
-typedef enum {
-    UNKNOWN,
-    HELLO,
-    START,
-    ERROR,
-} state_t;
-
-typedef struct context {
-    eppp_channel_fn_t transmit;
-    EventGroupHandle_t flags;
-    state_t state;
-    esp_netif_t *eppp;
-} context_t;
-
-#define HELLO_BIT BIT0
-#define START_BIT BIT1
-#define CONNECT_BIT BIT2
-#define DISCONNECT_BIT BIT3
-
-#define ALL_BITS (HELLO_BIT | START_BIT | CONNECT_BIT | DISCONNECT_BIT)
-
-static const char *TAG = "eppp_host_example_with_channels";
-static context_t *s_eppp_channel_ctx = NULL;
-
-static esp_err_t eppp_receive(esp_netif_t *netif, int nr, void *buffer, size_t len)
-{
-    context_t *ctx = eppp_get_context(netif);
-    if (nr == CHAT_CHANNEL) {
-        ESP_LOGI(TAG, "Received channel=%d len=%d %.*s", nr, (int)len, (int)len, (char *)buffer);
-        const char hello[] = "Hello server";
-        const char mac[] = "Get MAC";
-        if (len == sizeof(hello) && memcmp(buffer, hello, len) == 0) {
-            if (ctx->state == HELLO) {
-                xEventGroupSetBits(ctx->flags, HELLO_BIT);
-            } else {
-                ctx->state = ERROR;
-            }
-        } else if (len == sizeof(mac) && memcmp(buffer, mac, 5) == 0) {
-            if (ctx->state == HELLO) {
-                xEventGroupSetBits(ctx->flags, START_BIT);
-            } else {
-                ctx->state = ERROR;
-            }
-        }
-    } else if (nr == WIFI_CHANNEL) {
-        ESP_LOGD(TAG, "Received WIFI channel=%d len=%d", nr, (int)len);
-        ESP_LOG_BUFFER_HEXDUMP("wifi-receive", buffer, len, ESP_LOG_VERBOSE);
-        return esp_wifi_internal_tx(WIFI_IF_STA, buffer, len);
-    } else {
-        ESP_LOGE(TAG, "Incorrect channel number %d", nr);
-        return ESP_FAIL;
-    }
-    return ESP_OK;
-}
-
-static esp_err_t wifi_receive(void *buffer, uint16_t len, void *eb)
-{
-    s_eppp_channel_ctx->transmit(s_eppp_channel_ctx->eppp, WIFI_CHANNEL, buffer, len);
-    esp_wifi_internal_free_rx_buffer(eb);
-    return ESP_OK;
-}
-
-static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data)
-{
-    context_t *ctx = arg;
-    ESP_LOGI(TAG, "event_handler: event_base=%s event_id=%d", event_base, event_id);
-    if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) {
-        ESP_LOGI(TAG, "WIFI start event");
-        esp_wifi_connect();
-        xEventGroupSetBits(ctx->flags, CONNECT_BIT);
-    } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {
-        ESP_LOGI(TAG, "connect to the AP fail");
-        xEventGroupSetBits(ctx->flags, DISCONNECT_BIT);
-    }
-}
-
-
-static void init_wifi_driver(context_t *ctx)
-{
-    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
-    ESP_ERROR_CHECK(esp_wifi_init(&cfg));
-    ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID,
-                                               event_handler, ctx));
-    wifi_config_t wifi_config = {
-        .sta = {
-            .ssid = CONFIG_ESP_WIFI_SSID,
-            .password = CONFIG_ESP_WIFI_PASSWORD,
-        },
-    };
-    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
-    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
-}
-
-void station_over_eppp_channel(void *arg)
-{
-    __attribute__((unused)) esp_err_t ret;
-    context_t ctx = {
-        .transmit = NULL,
-        .flags = NULL,
-        .state = UNKNOWN,
-        .eppp = (esp_netif_t *)arg
-    };
-    ESP_GOTO_ON_FALSE(ctx.flags = xEventGroupCreate(), ESP_FAIL, err, TAG, "Failed to create event group");
-    ESP_GOTO_ON_ERROR(eppp_add_channels(ctx.eppp, &ctx.transmit, eppp_receive, &ctx), err, TAG, "Failed to add channels");
-    ESP_GOTO_ON_FALSE(ctx.transmit, ESP_FAIL, err, TAG, "Channel tx function is not set");
-    init_wifi_driver(&ctx);
-
-    while (1) {
-        EventBits_t bits = xEventGroupWaitBits(ctx.flags, ALL_BITS, pdTRUE, pdFALSE, pdMS_TO_TICKS(1000));
-        if (bits & HELLO_BIT) {
-            ESP_LOGI(TAG, "Hello from client received");
-            const char hello[] = "Hello client";
-            ctx.transmit(ctx.eppp, CHAT_CHANNEL, (void*)hello, sizeof(hello));
-        } else if (bits & START_BIT) {
-            ctx.state = START;
-            ESP_LOGI(TAG, "Starting WIFI");
-            uint8_t mac[6];
-            if (esp_wifi_get_mac(WIFI_IF_STA, mac) != ESP_OK) {
-                ESP_LOGE(TAG, "esp_wifi_get_mac failed");
-                ctx.state = ERROR;
-                continue;
-            }
-            char mac_data[5 /* MAC: */ + 6 * 2 /* 6 bytes per char */ + 5 /* : */ + 1 /* \0 */];
-            sprintf(mac_data, "MAC: %02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-            ESP_LOGI(TAG, "Sending MAC: %.*s", (int)sizeof(mac_data), mac_data);
-            ctx.transmit(ctx.eppp, CHAT_CHANNEL, (void*)mac_data, sizeof(mac_data));
-            ret = esp_wifi_start();
-            ESP_LOGI(TAG, "WIFI start result: %d", ret);
-            s_eppp_channel_ctx = &ctx;
-            esp_wifi_internal_reg_rxcb(WIFI_IF_STA, wifi_receive);
-        } else if (bits & CONNECT_BIT) {
-            ESP_LOGI(TAG, "WIFI connected");
-            const char connected[] = "Connected";
-            ctx.transmit(ctx.eppp, CHAT_CHANNEL, (void*)connected, sizeof(connected));
-        } else if (bits & DISCONNECT_BIT) {
-            const char disconnected[] = "Disconnected";
-            ctx.transmit(ctx.eppp, CHAT_CHANNEL, (void*)disconnected, sizeof(disconnected));
-        } else if (ctx.state != START) {
-            ctx.state = HELLO;
-            const char up[] = "Server up";
-            esp_wifi_disconnect();
-            esp_wifi_stop();
-            ctx.transmit(ctx.eppp, CHAT_CHANNEL, (void*)up, sizeof(up));
-        }
-    }
-
-err:
-    vTaskDelete(NULL);
-}

components/eppp_link/examples/slave/main/eppp_slave.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -11,14 +11,12 @@
 #include "esp_wifi.h"
 #include "esp_event.h"
 #include "esp_log.h"
-#include "esp_check.h"
 #include "nvs_flash.h"
 #include "eppp_link.h"
-#include "inttypes.h"
 
 static const char *TAG = "eppp_slave";
 
-#if defined(CONFIG_SOC_WIFI_SUPPORTED) && !defined(CONFIG_EXAMPLE_WIFI_OVER_EPPP_CHANNEL)
+#if CONFIG_SOC_WIFI_SUPPORTED
 
 /* FreeRTOS event group to signal when we are connected*/
 static EventGroupHandle_t s_wifi_event_group;
@@ -29,13 +27,12 @@ static EventGroupHandle_t s_wifi_event_group;
 #define WIFI_CONNECTED_BIT BIT0
 #define WIFI_FAIL_BIT      BIT1
 
+
 static int s_retry_num = 0;
 
 static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data)
 {
-    ESP_LOGI(TAG, "event_handler: event_base=%s event_id=%" PRIi32, event_base, event_id);
     if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) {
-        ESP_LOGI(TAG, "WIFI start event");
         esp_wifi_connect();
     } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {
         if (s_retry_num < CONFIG_ESP_MAXIMUM_RETRY) {
@@ -58,6 +55,9 @@ void init_network_interface(void)
 {
     s_wifi_event_group = xEventGroupCreate();
 
+    ESP_ERROR_CHECK(esp_netif_init());
+
+    ESP_ERROR_CHECK(esp_event_loop_create_default());
     esp_netif_create_default_wifi_sta();
 
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
@@ -66,15 +66,15 @@ void init_network_interface(void)
     esp_event_handler_instance_t instance_any_id;
     esp_event_handler_instance_t instance_got_ip;
     ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT,
-                                                        ESP_EVENT_ANY_ID,
-                                                        &event_handler,
-                                                        NULL,
-                                                        &instance_any_id));
+                    ESP_EVENT_ANY_ID,
+                    &event_handler,
+                    NULL,
+                    &instance_any_id));
     ESP_ERROR_CHECK(esp_event_handler_instance_register(IP_EVENT,
-                                                        IP_EVENT_STA_GOT_IP,
-                                                        &event_handler,
-                                                        NULL,
-                                                        &instance_got_ip));
+                    IP_EVENT_STA_GOT_IP,
+                    &event_handler,
+                    NULL,
+                    &instance_got_ip));
 
     wifi_config_t wifi_config = {
         .sta = {
@@ -82,9 +82,9 @@ void init_network_interface(void)
             .password = CONFIG_ESP_WIFI_PASSWORD,
         },
     };
-    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
-    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config));
-    ESP_ERROR_CHECK(esp_wifi_start());
+    ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA) );
+    ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &wifi_config) );
+    ESP_ERROR_CHECK(esp_wifi_start() );
 
     ESP_LOGI(TAG, "wifi_init_sta finished.");
 
@@ -110,15 +110,12 @@ void init_network_interface(void)
 }
 #else
 
-// If the SoC does not have WiFi capabilities, we can initialize a different network interface, this function is a placeholder for that purpose.
-// This function is also a no-op if EXAMPLE_WIFI_OVER_EPPP_CHANNEL==1, since the Wi-Fi network interface will live on the other peer (on the host side).
 void init_network_interface(void)
 {
+    // placeholder to initialize any other network interface if WiFi is not available
 }
 
-#endif // SoC WiFi capable chip || WiFi over EPPP channel
-
-void station_over_eppp_channel(void *arg);
+#endif // SoC WiFi capable chip
 
 void app_main(void)
 {
@@ -130,21 +127,13 @@ void app_main(void)
     }
     ESP_ERROR_CHECK(ret);
 
-    ESP_ERROR_CHECK(esp_netif_init());
-    ESP_ERROR_CHECK(esp_event_loop_create_default());
     init_network_interface();   // WiFi station if withing SoC capabilities (otherwise a placeholder)
+//    ESP_ERROR_CHECK(esp_netif_init());
+//    ESP_ERROR_CHECK(esp_event_loop_create_default());
 
     eppp_config_t config = EPPP_DEFAULT_SERVER_CONFIG();
 #if CONFIG_EPPP_LINK_DEVICE_SPI
     config.transport = EPPP_TRANSPORT_SPI;
-    config.spi.is_master = false;
-    config.spi.host = CONFIG_EXAMPLE_SPI_HOST;
-    config.spi.mosi = CONFIG_EXAMPLE_SPI_MOSI_PIN;
-    config.spi.miso = CONFIG_EXAMPLE_SPI_MISO_PIN;
-    config.spi.sclk = CONFIG_EXAMPLE_SPI_SCLK_PIN;
-    config.spi.cs = CONFIG_EXAMPLE_SPI_CS_PIN;
-    config.spi.intr = CONFIG_EXAMPLE_SPI_INTR_PIN;
-    config.spi.freq = CONFIG_EXAMPLE_SPI_FREQUENCY;
 #elif CONFIG_EPPP_LINK_DEVICE_UART
     config.transport = EPPP_TRANSPORT_UART;
     config.uart.tx_io = CONFIG_EXAMPLE_UART_TX_PIN;
@@ -159,9 +148,5 @@ void app_main(void)
         ESP_LOGE(TAG, "Failed to setup connection");
         return ;
     }
-#ifdef CONFIG_EXAMPLE_WIFI_OVER_EPPP_CHANNEL
-    station_over_eppp_channel(eppp_netif);
-#else
     ESP_ERROR_CHECK(esp_netif_napt_enable(eppp_netif));
-#endif // CONFIG_EXAMPLE_WIFI_OVER_EPPP_CHANNEL
 }

components/eppp_link/examples/slave/sdkconfig.ci.1

@@ -1,4 +0,0 @@
-CONFIG_IDF_TARGET="esp32s2"
-CONFIG_EPPP_LINK_DEVICE_SPI=y
-CONFIG_EPPP_LINK_CHANNELS_SUPPORT=y
-CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n

components/eppp_link/examples/slave/sdkconfig.ci.2

@@ -1,4 +0,0 @@
-CONFIG_IDF_TARGET="esp32c2"
-CONFIG_EPPP_LINK_DEVICE_UART=y
-CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n
-CONFIG_EPPP_LINK_USES_PPP=y

components/eppp_link/examples/slave/sdkconfig.ci.eth

@@ -1,2 +0,0 @@
-CONFIG_IDF_TARGET="esp32"
-CONFIG_EPPP_LINK_DEVICE_ETH=y

components/eppp_link/examples/slave/sdkconfig.ci.ipv4_only

@@ -1 +0,0 @@
-CONFIG_LWIP_IPV6=n

components/eppp_link/examples/slave/sdkconfig.ci.sdio

@@ -1,2 +0,0 @@
-CONFIG_IDF_TARGET="esp32c6"
-CONFIG_EPPP_LINK_DEVICE_SDIO=y

components/eppp_link/examples/slave/sdkconfig.defaults

@@ -1,3 +1,6 @@
 CONFIG_LWIP_IP_FORWARD=y
 CONFIG_LWIP_IPV4_NAPT=y
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=4096
+CONFIG_LWIP_PPP_SUPPORT=y
+CONFIG_LWIP_PPP_SERVER_SUPPORT=y
+CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n

components/eppp_link/idf_component.yml

@@ -1,4 +1,4 @@
-version: 1.1.4
+version: 0.2.0
 url: https://github.com/espressif/esp-protocols/tree/master/components/eppp_link
 description: The component provides a general purpose PPP connectivity, typically used as WiFi-PPP router
 dependencies:

components/eppp_link/include/eppp_link.h

@@ -1,18 +1,14 @@
 /*
- * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #define EPPP_DEFAULT_SERVER_IP() ESP_IP4TOADDR(192, 168, 11, 1)
 #define EPPP_DEFAULT_CLIENT_IP() ESP_IP4TOADDR(192, 168, 11, 2)
 
-#define EPPP_DEFAULT_SPI_CONFIG()               \
+#define EPPP_DEFAULT_CONFIG(our_ip, their_ip) { \
+    .transport = EPPP_TRANSPORT_UART,           \
     .spi = {                                    \
             .host = 1,                          \
             .mosi = 11,                         \
@@ -25,8 +21,6 @@ extern "C" {
             .cs_ena_pretrans = 0,               \
             .cs_ena_posttrans = 0,              \
     },                                          \
-
-#define EPPP_DEFAULT_UART_CONFIG() \
     .uart = {   \
             .port = 1,          \
             .baud = 921600,     \
@@ -34,58 +28,16 @@ extern "C" {
             .rx_io = 26,        \
             .queue_size = 16,   \
             .rx_buffer_size = 1024, \
-            .rts_io = -1,       \
-            .cts_io = -1,       \
-            .flow_control = 0,  \
     },                          \
-
-#define EPPP_DEFAULT_SDIO_CONFIG() \
     .sdio = {                                   \
             .width = 4,                         \
             .clk = 18,                          \
             .cmd = 19,                          \
-            .d0 = 14,                           \
-            .d1 = 15,                           \
+            .d0 = 49,                           \
+            .d1 = 50,                           \
             .d2 = 16,                           \
             .d3 = 17,           \
     },                          \
-
-#define EPPP_DEFAULT_ETH_CONFIG()   \
-    .ethernet = {                   \
-        .mdc_io = 23,               \
-        .mdio_io = 18,              \
-        .phy_addr = 1,              \
-        .rst_io= 5,                 \
-    },                              \
-
-#if CONFIG_EPPP_LINK_DEVICE_SPI
-#define EPPP_DEFAULT_TRANSPORT_CONFIG() EPPP_DEFAULT_SPI_CONFIG()
-#define EPPP_TRANSPORT_INIT(cfg)        eppp_spi_init(&cfg->spi)
-#define EPPP_TRANSPORT_DEINIT(handle)   eppp_spi_deinit(handle)
-
-#elif CONFIG_EPPP_LINK_DEVICE_UART
-#define EPPP_DEFAULT_TRANSPORT_CONFIG() EPPP_DEFAULT_UART_CONFIG()
-#define EPPP_TRANSPORT_INIT(cfg)        eppp_uart_init(&cfg->uart)
-#define EPPP_TRANSPORT_DEINIT(handle)   eppp_uart_deinit(handle)
-
-#elif CONFIG_EPPP_LINK_DEVICE_SDIO
-#define EPPP_DEFAULT_TRANSPORT_CONFIG() EPPP_DEFAULT_SDIO_CONFIG()
-#define EPPP_TRANSPORT_INIT(cfg)        eppp_sdio_init(&cfg->sdio)
-#define EPPP_TRANSPORT_DEINIT(handle)   eppp_sdio_deinit(handle)
-
-#elif CONFIG_EPPP_LINK_DEVICE_ETH
-#define EPPP_DEFAULT_TRANSPORT_CONFIG() EPPP_DEFAULT_ETH_CONFIG()
-#define EPPP_TRANSPORT_INIT(cfg)        eppp_eth_init(&cfg->ethernet)
-#define EPPP_TRANSPORT_DEINIT(handle)   eppp_eth_deinit(handle)
-
-#else
-#error Unexpeted transport
-#endif
-
-
-#define EPPP_DEFAULT_CONFIG(our_ip, their_ip) { \
-    .transport = EPPP_TRANSPORT_UART,           \
-    EPPP_DEFAULT_TRANSPORT_CONFIG()             \
     . task = {                  \
             .run_task = true,   \
             .stack_size = 4096, \
@@ -111,15 +63,14 @@ typedef enum eppp_transport {
     EPPP_TRANSPORT_UART,
     EPPP_TRANSPORT_SPI,
     EPPP_TRANSPORT_SDIO,
-    EPPP_TRANSPORT_ETHERNET,
 } eppp_transport_t;
 
 
 typedef struct eppp_config_t {
     eppp_transport_t transport;
+
     struct eppp_config_spi_s {
         int host;
-        bool is_master;
         int mosi;
         int miso;
         int sclk;
@@ -138,13 +89,9 @@ typedef struct eppp_config_t {
         int rx_io;
         int queue_size;
         int rx_buffer_size;
-        int rts_io;
-        int cts_io;
-        int flow_control;
     } uart;
 
     struct eppp_config_sdio_s {
-        bool is_host;
         int width;
         int clk;
         int cmd;
@@ -154,13 +101,6 @@ typedef struct eppp_config_t {
         int d3;
     } sdio;
 
-    struct eppp_config_ethernet_s {
-        int mdc_io;
-        int mdio_io;
-        int phy_addr;
-        int rst_io;
-    } ethernet;
-
     struct eppp_config_task_s {
         bool run_task;
         int stack_size;
@@ -176,51 +116,20 @@ typedef struct eppp_config_t {
 
 } eppp_config_t;
 
-typedef struct eppp_handle* eppp_transport_handle_t;
-
 esp_netif_t *eppp_connect(eppp_config_t *config);
 
 esp_netif_t *eppp_listen(eppp_config_t *config);
 
 void eppp_close(esp_netif_t *netif);
 
-/**
- * @brief Initialize the EPPP link layer
- * @param role
- * @param config
- * @return
- */
 esp_netif_t *eppp_init(eppp_type_t role, eppp_config_t *config);
 
 void eppp_deinit(esp_netif_t *netif);
 
 esp_netif_t *eppp_open(eppp_type_t role, eppp_config_t *config, int connect_timeout_ms);
 
-esp_netif_t *eppp_netif_init(eppp_type_t role, eppp_transport_handle_t h, eppp_config_t *eppp_config);
-
 esp_err_t eppp_netif_stop(esp_netif_t *netif, int stop_timeout_ms);
 
 esp_err_t eppp_netif_start(esp_netif_t *netif);
 
-void eppp_netif_deinit(esp_netif_t *netif);
-
-/**
- * @brief Performs EPPP link task operation (Used for task-less implementation)
- * @param netif
- * @return
- *  - ESP_OK on success, ESP_FAIL on failure: the operation shall continue
- *  - ESP_ERR_TIMEOUT indicates that the operation was requested to stop
- */
 esp_err_t eppp_perform(esp_netif_t *netif);
-
-#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-typedef esp_err_t (*eppp_channel_fn_t)(esp_netif_t *netif, int nr, void *buffer, size_t len);
-
-esp_err_t eppp_add_channels(esp_netif_t *netif, eppp_channel_fn_t *tx, const eppp_channel_fn_t rx, void* context);
-
-void* eppp_get_context(esp_netif_t *netif);
-#endif // CONFIG_EPPP_LINK_CHANNELS_SUPPORT
-
-#ifdef __cplusplus
-}
-#endif

components/eppp_link/include/eppp_transport_eth.h

@@ -1,11 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#pragma once
-
-#include "eppp_link.h"
-
-eppp_transport_handle_t eppp_eth_init(struct eppp_config_ethernet_s *config);
-void eppp_eth_deinit(eppp_transport_handle_t h);

components/eppp_link/include/eppp_transport_sdio.h

@@ -1,11 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#pragma once
-
-#include "eppp_link.h"
-
-eppp_transport_handle_t eppp_sdio_init(struct eppp_config_sdio_s *config);
-void eppp_sdio_deinit(eppp_transport_handle_t h);

components/eppp_link/include/eppp_transport_spi.h

@@ -1,11 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#pragma once
-
-#include "eppp_link.h"
-
-eppp_transport_handle_t eppp_spi_init(struct eppp_config_spi_s *config);
-void eppp_spi_deinit(eppp_transport_handle_t h);

components/eppp_link/include/eppp_transport_uart.h

@@ -1,11 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#pragma once
-
-#include "eppp_link.h"
-
-eppp_transport_handle_t eppp_uart_init(struct eppp_config_uart_s *config);
-void eppp_uart_deinit(eppp_transport_handle_t h);

components/eppp_link/test/test_app/CMakeLists.txt

@@ -1,15 +1,7 @@
 # The following four lines of boilerplate have to be in your project's CMakeLists
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
+set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/tools/unit-test-app/components)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-
-if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "6.0")
-    set(test_component_dir $ENV{IDF_PATH}/tools/test_apps/components)
-else()
-    set(test_component_dir $ENV{IDF_PATH}/tools/unit-test-app/components)
-endif()
-
-set(EXTRA_COMPONENT_DIRS ${test_component_dir})
-
 project(test_app)

components/eppp_link/test/test_app/main/CMakeLists.txt

@@ -1,10 +1,4 @@
-if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER "5.3")
-    set(driver_deps esp_driver_gpio esp_driver_spi esp_driver_uart esp_driver_sdio)
-else()
-    set(driver_deps driver)
-endif()
-
 idf_component_register(SRCS app_main.c
                     INCLUDE_DIRS "."
                     REQUIRES test_utils
-                    PRIV_REQUIRES unity nvs_flash esp_netif esp_event ${driver_deps})
+                    PRIV_REQUIRES unity nvs_flash esp_netif driver esp_event)