Skip to content

Upstream 1.8.2 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ausyskin merged 3 commits into from
May 14, 2026
Merged

Upstream 1.8.2 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b814ea1
libmei: CMake: Linux: overwrite FORTIFY_SOURCE from distribution
ausyskin Jan 8, 2026
341f114
libmei: update android logging
ausyskin Jan 28, 2026
e6fc8fb
libmei: bump version to 1.8.2
ausyskin Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## [1.8.2]

### Fixed
- CMake: Linux: overwrite FORTIFY_SOURCE from distribution

### Changed
- update android logging

## [1.8.1]

### Changed
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright (C) 2016-2024 Intel Corporation
# Copyright (C) 2016-2026 Intel Corporation
cmake_minimum_required(VERSION 3.10)
project(mei C)

Expand Down Expand Up @@ -42,6 +42,7 @@ set(COMPILE_OPTIONS
--param
ssp-buffer-size=4
-ftrapv
-U_FORTIFY_SOURCE
-D_FORTIFY_SOURCE=2
-O2
-Wformat
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8.1
1.8.2
35 changes: 11 additions & 24 deletions mei.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright(c) 2013 - 2025 Intel Corporation. All rights reserved.
* Copyright(c) 2013 - 2026 Intel Corporation. All rights reserved.
*
* Intel Management Engine Interface (Intel MEI) Library
*/
Expand All @@ -23,27 +23,17 @@
/*****************************************************************************
* Intel Management Engine Interface
*****************************************************************************/
#ifdef ANDROID
#define LOG_TAG "libmei"
#include <android/log_macros.h>
#define mei_msg(_me, fmt, ARGS...) \
((_me->log_level >= MEI_LOG_LEVEL_VERBOSE) \
? (void)ALOGV(fmt, ##ARGS) \
: (void)0)

#define mei_err(_me, fmt, ARGS...) ALOGE(fmt, ##ARGS)
#ifdef DEBUG
static inline void __dump_buffer(const char *buf)
{
ALOGV("%s\n", buf);
}
#endif /* DEBUG */

#else /* ! ANDROID */
#ifdef SYSLOG
#include <syslog.h>
#define __mei_msg(fmt, ...) syslog(LOG_DEBUG, fmt, ##__VA_ARGS__)
#define __mei_err(fmt, ...) syslog(LOG_ERR, fmt, ##__VA_ARGS__)
#ifdef ANDROID
#define LOG_TAG "libmei"
#include <android/log_macros.h>
#define __mei_msg(fmt, ...) ALOGV(fmt, ##__VA_ARGS__)
#define __mei_err(fmt, ...) ALOGE(fmt, ##__VA_ARGS__)
#else /* ANDROID */
#include <syslog.h>
#define __mei_msg(fmt, ...) syslog(LOG_DEBUG, fmt, ##__VA_ARGS__)
#define __mei_err(fmt, ...) syslog(LOG_ERR, fmt, ##__VA_ARGS__)
#endif /* ANDROID */
#else
#include <stdlib.h>
#define __mei_msg(fmt, ...) fprintf(stdout, fmt, ##__VA_ARGS__)
Expand Down Expand Up @@ -80,10 +70,7 @@ static inline void __dump_buffer(const char *buf)
{
__mei_msg("%s\n", buf);
}
#endif /* DEBUG */
#endif /* ANDROID */

#ifdef DEBUG
static void dump_hex_buffer(const unsigned char *buf, size_t len)
{
#define LINE_LEN 16
Expand Down
Loading