Merge remote-tracking branch 'origin/develop' into user/jvalesmena/new-build-samples

# Conflicts:
#	Build-AllSamples.ps1
#	Build-SampleSet.ps1

6 files changed, 7 insertions, 152 deletions

diff --git a/.github/workflows/StaleIssues.yml b/.github/workflows/StaleIssues.yml
deleted file mode 100644
index d3a3776a..00000000
--- a/.github/workflows/StaleIssues.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Close inactive issues
-on:
-  workflow_dispatch:
-jobs:
-  close-issues:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - uses: actions/stale@v10
-        with:
-          days-before-issue-stale: 365
-          stale-issue-label: "stale"
-          stale-issue-message: "This issue has been inactive for a year. It will be closed in 31 days if no further activity occurs. If you believe this issue is still relevant, please comment to keep it open."
-          operations-per-run: 400
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tag-codeowner-on-issue.yml b/.github/workflows/tag-codeowner-on-issue.yml
index fceed633..a4fe365d 100644
--- a/.github/workflows/tag-codeowner-on-issue.yml
+++ b/.github/workflows/tag-codeowner-on-issue.yml
@@ -6,7 +6,6 @@ on:
 
 jobs:
   tag-codeowner:
-    if: false # Disabled - workflow intentionally turned off
     runs-on: ubuntu-latest
 
     steps:
@@ -24,13 +23,15 @@ jobs:
       - name: Extract selected path and tag codeowner
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE_BODY: ${{ github.event.issue.body }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
         run: |
           python3 - <<EOF
           import os
           import re
           import requests
 
-          issue_body = """${{ github.event.issue.body }}"""
+          issue_body = os.environ['ISSUE_BODY']
           selected_path = None
 
           # Try to extract the selected path from the issue body
@@ -69,8 +70,9 @@ jobs:
           comment = f"{codeowner} can you please take a look at this issue related to {selected_path}?"
           repo = os.environ['GITHUB_REPOSITORY']
           token = os.environ['GITHUB_TOKEN']
+          issue_number = os.environ['ISSUE_NUMBER']
 
-          url = f"https://api.github.com/repos/{repo}/issues/${{ github.event.issue.number }}/comments"
+          url = f"https://api.github.com/repos/{repo}/issues/{issue_number}/comments"
           headers = {
               "Authorization": f"Bearer {token}",
               "Accept": "application/vnd.github.v3+json"
diff --git a/simbatt/func/batclass_prepublish.h b/simbatt/func/batclass_prepublish.h
deleted file mode 100644
index a952222b..00000000
--- a/simbatt/func/batclass_prepublish.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*++
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-Module Name:
-
-    batclass_prepublish.h
-
-Abstract:
-
-    This module defines pre-publish definations to be made available in DDK/SDK.
-
-    N.B. This file must not be included when batclass.h defines 
-         BATTERY_MINIPORT_INFO_V1_1 type and BATTERY_CLASS_MINOR_VERSION_1.
-
-    N.B. This code is provided "AS IS" without any expressed or implied warranty.
-
---*/
-
-//---------------------------------------------------------------------- Pragmas
-
-#pragma once
-
-//--------------------------------------------------------------------- Includes
-
-#include <batclass.h>
-
-//-------------------------------------------------- Would be Public Definitions
-
-#ifndef BATTERY_CLASS_MINOR_VERSION_1
-
-typedef struct {
-    USHORT                          MajorVersion;
-    USHORT                          MinorVersion;
-
-    PVOID                           Context;        // Miniport context
-
-    BCLASS_QUERY_TAG                QueryTag;
-    BCLASS_QUERY_INFORMATION        QueryInformation;
-    BCLASS_SET_INFORMATION          SetInformation;
-    BCLASS_QUERY_STATUS             QueryStatus;
-    BCLASS_SET_STATUS_NOTIFY        SetStatusNotify;
-    BCLASS_DISABLE_STATUS_NOTIFY    DisableStatusNotify;
-    PDEVICE_OBJECT                  Pdo;
-    PUNICODE_STRING                 DeviceName;
-    PDEVICE_OBJECT                  Fdo;
-} BATTERY_MINIPORT_INFO_V1_1, *PBATTERY_MINIPORT_INFO_V1_1;
-
-#define BATTERY_CLASS_MINOR_VERSION_1   0x0001
-
-#endif // BATTERY_CLASS_MINOR_VERSION_1
diff --git a/simbatt/func/miniclass.c b/simbatt/func/miniclass.c
index 612b4c66..78a13bdf 100644
--- a/simbatt/func/miniclass.c
+++ b/simbatt/func/miniclass.c
@@ -239,9 +239,7 @@ Return Value:
         DevExt->State.BatteryStatus.Capacity = 100;
         DevExt->State.BatteryStatus.Voltage = BATTERY_UNKNOWN_VOLTAGE;
         DevExt->State.BatteryStatus.Rate = 0;
-        DevExt->State.BatteryInfo.Capabilities = BATTERY_SYSTEM_BATTERY |
-                                                 BATTERY_CAPACITY_RELATIVE;
-
+        DevExt->State.BatteryInfo.Capabilities = BATTERY_SYSTEM_BATTERY;
         DevExt->State.BatteryInfo.Technology = 1;
         DevExt->State.BatteryInfo.Chemistry[0] = 'F';
         DevExt->State.BatteryInfo.Chemistry[1] = 'a';
diff --git a/simbatt/func/simbattdriverif.h b/simbatt/func/simbattdriverif.h
index 6fb45d8b..04549f72 100644
--- a/simbatt/func/simbattdriverif.h
+++ b/simbatt/func/simbattdriverif.h
@@ -26,20 +26,6 @@ Abstract:
 //------------------------------------------------------------------ Definitions
 
 //
-// Battery bus driver interface
-//
-
-// {780AC894-01FF-4b5e-B4C8-9C00709200EB}
-DEFINE_GUID(BATTBUS_DEVINTERFACE_GUID,
-    0x780ac894, 0x1ff, 0x4b5e, 0xb4, 0xc8, 0x9c, 0x0, 0x70, 0x92, 0x0, 0xeb);
-
-#define BATTBUS_IOCTL(_index_) \
-    CTL_CODE(FILE_DEVICE_BUS_EXTENDER, _index_, METHOD_BUFFERED, FILE_READ_DATA)
-
-#define IOCTL_BATTBUS_PLUGIN_HARDWARE                   BATTBUS_IOCTL(0x0)
-#define IOCTL_BATTBUS_UNPLUG_HARDWARE                   BATTBUS_IOCTL(0x1)
-
-//
 // Simulated battery ioctl interface
 //
 
@@ -62,67 +48,3 @@ DEFINE_GUID(SIMBATT_DEVINTERFACE_GUID,
 #define IOCTL_SIMBATT_SET_UNIQUE_ID                     SIMBATT_IOCTL(0x809)
 #define IOCTL_SIMBATT_GET_MAXCHARGINGCURRENT            SIMBATT_IOCTL(0x810)
 #define SIMBATT_RATE_CALCULATE                          0x7fffffff
-#define MAX_SUPPORTED_SIMBATT_CHILDREN                  20
-
-//------------------------------------------------------------------- Data Types
-
-//
-//  Data structure used in PlugIn and UnPlug ioctls
-//
-
-#define BATTBUS_TYPE_SIMBATT 0;
-
-typedef struct _BATTBUS_PLUGIN_HARDWARE
-{
-    //
-    // Size of this type.
-    //
-
-    ULONG Size;
-
-    //
-    // Unique serial number of the device to be enumerated.
-    // Enumeration will be failed if another device on the
-    // bus has the same serial number.
-    //
-
-    ULONG SerialNo;
-
-    //
-    // UI number.
-    //
-
-    ULONG UINumber;
-
-    //
-    // Type of device being enumerated
-    //
-    // Reserved value, set to 0.
-    //
-
-    ULONG Type;
-
-} BATTBUS_PLUGIN_HARDWARE, *PBATTBUS_PLUGIN_HARDWARE;
-
-typedef struct _BATTBUS_UNPLUG_HARDWARE
-{
-    //
-    // size of this type
-    //
-
-    ULONG Size;
-
-    //
-    // Serial number of the device to be unplugged.
-    //
-
-    ULONG SerialNo;
-
-    //
-    // Must not be referenced used.
-    //
-
-    ULONG Reserved[2];
-
-} BATTBUS_UNPLUG_HARDWARE, *PBATTBUS_UNPLUG_HARDWARE;
-
diff --git a/simbatt/func/wdf.c b/simbatt/func/wdf.c
index de9aee30..3b9e87ad 100644
--- a/simbatt/func/wdf.c
+++ b/simbatt/func/wdf.c
@@ -19,7 +19,7 @@ Abstract:
 
 #include "simbatt.h"
 #include "simbattdriverif.h"
-#include "batclass_prepublish.h"
+#include <batclass.h>
 
 //------------------------------------------------------------------- Prototypes