1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-02 12:20:51 +00:00

- Add an entry for the SIIG Cyber 2SP1 PCIe adapter, which is based

on an Oxford Semiconductor OX16PCI954 but uses only two ports and
  a non-default clock rate.
- Fix style/whitespace

PR:		176407
MFC after:	3 days
This commit is contained in:
Marius Strobl 2015-12-28 20:24:08 +00:00
parent 7aedea5357
commit 1714dcab20
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=292840

View File

@ -763,6 +763,12 @@ const struct puc_cfg puc_pci_devices[] = {
PUC_PORT_4S, 0x10, 0, 8,
},
{ 0x1415, 0x950a, 0x131f, 0x2061,
"SIIG Cyber 2SP1 PCIe",
DEFAULT_RCLK * 10,
PUC_PORT_2S, 0x10, 0, 8,
},
{ 0x1415, 0x950a, 0xffff, 0,
"Oxford Semiconductor OX16PCI954 UARTs",
DEFAULT_RCLK,
@ -840,9 +846,9 @@ const struct puc_cfg puc_pci_devices[] = {
*/
{ 0x1415, 0xc11b, 0xffff, 0,
"Oxford Semiconductor OXPCIe952 1S1P",
DEFAULT_RCLK * 0x22,
PUC_PORT_NONSTANDARD, 0x10, 0, -1,
"Oxford Semiconductor OXPCIe952 1S1P",
DEFAULT_RCLK * 0x22,
PUC_PORT_NONSTANDARD, 0x10, 0, -1,
.config_function = puc_config_oxford_pcie
},
@ -1275,7 +1281,8 @@ puc_config_moxa(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
if (cmd == PUC_CFG_GET_OFS) {
const struct puc_cfg *cfg = sc->sc_cfg;
if (port == 3 && (cfg->device == 0x1045 || cfg->device == 0x1144))
if (port == 3 && (cfg->device == 0x1045 ||
cfg->device == 0x1144))
port = 7;
*res = port * 0x200;