diff options
| author | marius <marius@FreeBSD.org> | 2015-12-28 20:24:08 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2015-12-28 20:24:08 +0000 |
| commit | 9f8cae598dd30e495c690eb4834da53e9935c2bb (patch) | |
| tree | e6b21bb52e6c942b5c8ff2f63c823677fbbef188 /sys/dev/puc | |
| parent | 42cdd645e40674c7c23c83a1b7617b7b97dd8b01 (diff) | |
| download | FreeBSD-src-9f8cae598dd30e495c690eb4834da53e9935c2bb.zip FreeBSD-src-9f8cae598dd30e495c690eb4834da53e9935c2bb.tar.gz | |
- 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
Diffstat (limited to 'sys/dev/puc')
| -rw-r--r-- | sys/dev/puc/pucdata.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c index 4646fa4..3550cb4 100644 --- a/sys/dev/puc/pucdata.c +++ b/sys/dev/puc/pucdata.c @@ -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; |
