-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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.
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
x86: revert removing soc.h from atom soc #69758
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
* Copyright (c) 2010-2015, Wind River Systems, Inc. | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
/** | ||
* @file | ||
* @brief Board configuration macros for the ia32 platform | ||
* | ||
* This header file is used to specify and describe board-level aspects for | ||
* the 'ia32' platform. | ||
*/ | ||
|
||
#ifndef __SOC_H_ | ||
#define __SOC_H_ | ||
|
||
#include <zephyr/sys/util.h> | ||
|
||
#ifndef _ASMLANGUAGE | ||
#include <zephyr/device.h> | ||
#include <zephyr/random/random.h> | ||
#endif | ||
|
||
/* PCI definitions */ | ||
/* FIXME: The values below copied from generic ia32 soc, we need to get the | ||
* correct numbers for Atom and the minnowboard | ||
* | ||
* This is added now to get basic enumeration of devices and verify that PCI | ||
* driver is functional. | ||
*/ | ||
#define PCI_BUS_NUMBERS 1 | ||
|
||
#define PCI_CTRL_ADDR_REG 0xCF8 | ||
#define PCI_CTRL_DATA_REG 0xCFC | ||
|
||
#define PCI_INTA 1 | ||
#define PCI_INTB 2 | ||
#define PCI_INTC 3 | ||
#define PCI_INTD 4 | ||
|
||
/** | ||
* | ||
* @brief Convert PCI interrupt PIN to IRQ | ||
* | ||
* @return IRQ number, -1 if the result is incorrect | ||
* | ||
*/ | ||
|
||
static inline int pci_pin2irq(int bus, int dev, int pin) | ||
{ | ||
ARG_UNUSED(bus); | ||
|
||
if ((pin < PCI_INTA) || (pin > PCI_INTD)) { | ||
return -1; | ||
} | ||
return 10 + (((pin + dev - 1) >> 1) & 1); | ||
} | ||
|
||
#endif /* __SOC_H_ */ |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,7 @@ | |
#include <zephyr/sys/byteorder.h> | ||
#include <zephyr/debug/stack.h> | ||
#include <zephyr/sys/__assert.h> | ||
#include <soc.h> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a bit surprising. What does hci_core.c need this for? I'd have expected to see reports of build failures, etc if it was absolutely necessary there. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. soc.h should not be on a subsys level file |
||
|
||
#include <zephyr/settings/settings.h> | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
none of these seem to be required by this file, only toolchain.h for ARG_UNUSED?