d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust pathnames for the move from i386/isa to dev/cy.

Browse Source 
Adjust staticness and a variable name for the split of cy.c into cy.c and
cy_isa.c.  Use the new header required for the split to avoid repeating
declarations in cy_pci.c.
This commit is contained in:
bde 2004-05-01 18:09:16 +00:00
parent fbdc9f2798
commit 08de77584a
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/cy/cy.c
View File

@ -82,8 +82,10 @@ __FBSDID("$FreeBSD$");
#include <machine/psl.h>
#include <i386/isa/cyreg.h>
#include <i386/isa/ic/cd1400.h>
#include <dev/ic/cd1400.h>
#include <dev/cy/cyreg.h>
#include <dev/cy/cyvar.h>
#define NCY 10 /* KLUDGE */
@ -326,6 +328,7 @@ struct com_s {
};
devclass_t cy_devclass;
char cy_driver_name[] = "cy";
static void cd1400_channel_cmd(struct com_s *com, int cmd);
static void cd1400_channel_cmd_wait(struct com_s *com);
@ -351,7 +354,6 @@ static void disc_optim(struct tty *tp, struct termios *t,
void cystatus(int unit);
#endif
static char driver_name[] = "cy";
static struct mtx sio_lock;
static int sio_inited;
@ -370,7 +372,7 @@ static struct cdevsw sio_cdevsw = {
.d_close = sioclose,
.d_write = siowrite,
.d_ioctl = sioioctl,
.d_name = driver_name,
.d_name = cy_driver_name,
.d_flags = D_TTY | D_NEEDGIANT,
};
@ -401,7 +403,7 @@ static int cy_total_devices;
#undef RxFifoThreshold
static int volatile RxFifoThreshold = (CD1400_RX_FIFO_SIZE / 2);
static int
int
cy_units(cy_iobase, cy_align)
cy_addr cy_iobase;
int cy_align;
@ -468,7 +470,7 @@ cyattach_common(cy_iobase, cy_align)
while (sio_inited != 2)
if (atomic_cmpset_int(&sio_inited, 0, 1)) {
mtx_init(&sio_lock, driver_name, NULL, MTX_SPIN);
mtx_init(&sio_lock, cy_driver_name, NULL, MTX_SPIN);
atomic_store_rel_int(&sio_inited, 2);
}

8
sys/dev/cy/cy_isa.c
View File

@ -40,8 +40,10 @@ __FBSDID("$FreeBSD$");
#include <sys/rman.h>
#include <machine/resource.h>
#include <i386/isa/cyreg.h>
#include <i386/isa/ic/cd1400.h>
#include <isa/isavar.h>
#include <dev/cy/cyreg.h>
#include <dev/cy/cyvar.h>
static int cy_isa_attach(device_t dev);
static int cy_isa_probe(device_t dev);
@ -55,7 +57,7 @@ static device_method_t cy_isa_methods[] = {
};
static driver_t cy_isa_driver = {
driver_name,
cy_driver_name,
cy_isa_methods,
0,
};

9
sys/dev/cy/cy_pci.c
View File

@ -48,6 +48,8 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcivar.h>
#include <dev/cy/cyvar.h>
#define CY_PCI_BASE_ADDR0 0x10
#define CY_PCI_BASE_ADDR1 0x14
#define CY_PCI_BASE_ADDR2 0x18
@ -66,11 +68,6 @@ __FBSDID("$FreeBSD$");
#define PLX_9060 0x0c
#define PLX_9080 0x0d
extern devclass_t cy_devclass;
void *cyattach_common(u_char volatile *iobase, int cy_align);
driver_intr_t cyintr;
static int cy_pci_attach(device_t dev);
static int cy_pci_probe(device_t dev);
@ -83,7 +80,7 @@ static device_method_t cy_pci_methods[] = {
};
static driver_t cy_pci_driver = {
"cy",
cy_driver_name,
cy_pci_methods,
0,
};