Skip to content
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

Jump to bottom

Remove extra system header include files #291

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove extra system header include files #291

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce13860
lib: Remove system specific irq.h files
glneo Jul 6, 2023
b1e1f11
lib: Remove system specific log.h files
glneo Jul 6, 2023
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
2 changes: 0 additions & 2 deletions lib/irq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ void metal_irq_enable(unsigned int vector);
*/
void metal_irq_disable(unsigned int vector);

#include <metal/system/@PROJECT_SYSTEM@/irq.h>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the only use case we need it is to include /lib/system/linux/irq.h
@tnmysh , @edmooring does AMD need the metal_linux_irq_register_dev() as external API?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure, but I prefer to keep headers for now.
Can take a look after this release.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure, but I prefer to keep headers for now. Can take a look after this release.

Probably late to address for this release without some risks...?
@tnmysh could you add it in your review list that we merge it ( or not) just after the release?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, this can be reviewed and merged after the release.

/** @} */

#ifdef __cplusplus
Expand Down
1 change: 0 additions & 1 deletion lib/system/freertos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ collect (PROJECT_LIB_HEADERS assert.h)
collect (PROJECT_LIB_HEADERS cache.h)
collect (PROJECT_LIB_HEADERS condition.h)
collect (PROJECT_LIB_HEADERS io.h)
collect (PROJECT_LIB_HEADERS irq.h)
collect (PROJECT_LIB_HEADERS log.h)
collect (PROJECT_LIB_HEADERS mutex.h)
collect (PROJECT_LIB_HEADERS sleep.h)
Expand Down
19 changes: 0 additions & 19 deletions lib/system/freertos/irq.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion lib/system/generic/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ collect (PROJECT_LIB_HEADERS assert.h)
collect (PROJECT_LIB_HEADERS cache.h)
collect (PROJECT_LIB_HEADERS condition.h)
collect (PROJECT_LIB_HEADERS io.h)
collect (PROJECT_LIB_HEADERS irq.h)
collect (PROJECT_LIB_HEADERS log.h)
collect (PROJECT_LIB_HEADERS mutex.h)
collect (PROJECT_LIB_HEADERS sleep.h)
Expand Down
19 changes: 0 additions & 19 deletions lib/system/generic/irq.h
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions lib/system/linux/device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include <metal/utilities.h>
#include <metal/irq.h>

#include "irq.h"

#define MAX_DRIVERS 64

struct linux_bus;
Expand Down
1 change: 0 additions & 1 deletion lib/system/nuttx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ collect (PROJECT_LIB_HEADERS assert.h)
collect (PROJECT_LIB_HEADERS cache.h)
collect (PROJECT_LIB_HEADERS condition.h)
collect (PROJECT_LIB_HEADERS io.h)
collect (PROJECT_LIB_HEADERS irq.h)
collect (PROJECT_LIB_HEADERS log.h)
collect (PROJECT_LIB_HEADERS mutex.h)
collect (PROJECT_LIB_HEADERS sleep.h)
Expand Down
2 changes: 2 additions & 0 deletions lib/system/nuttx/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include <metal/irq.h>
#include <metal/sys.h>

#include "irq.h"

struct metal_state _metal;

int metal_sys_init(const struct metal_init_params *params)
Expand Down
3 changes: 2 additions & 1 deletion lib/system/nuttx/irq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
#include <metal/irq_controller.h>
#include <metal/alloc.h>
#include <nuttx/arch.h>
#include <nuttx/irq.h>

#include "irq.h"

unsigned int metal_irq_save_disable(void)
{
Expand Down
1 change: 0 additions & 1 deletion lib/system/zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ collect (PROJECT_LIB_HEADERS assert.h)
collect (PROJECT_LIB_HEADERS cache.h)
collect (PROJECT_LIB_HEADERS condition.h)
collect (PROJECT_LIB_HEADERS io.h)
collect (PROJECT_LIB_HEADERS irq.h)
collect (PROJECT_LIB_HEADERS log.h)
collect (PROJECT_LIB_HEADERS mutex.h)
collect (PROJECT_LIB_HEADERS sleep.h)
Expand Down
27 changes: 0 additions & 27 deletions lib/system/zephyr/irq.h
View file
Open in desktop

This file was deleted.