diff options
| author | imp <imp@FreeBSD.org> | 2003-04-23 23:40:28 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-04-23 23:40:28 +0000 |
| commit | 847a005af40e2d86c88f3833f163b4755c860787 (patch) | |
| tree | ca455befa340958328fb41c90cd16776bf872da2 /usr.sbin/pccard | |
| parent | 5c827309fcbfa496d917dad6be838e8a04d33d56 (diff) | |
| download | FreeBSD-src-847a005af40e2d86c88f3833f163b4755c860787.zip FreeBSD-src-847a005af40e2d86c88f3833f163b4755c860787.tar.gz | |
Copy CIS3 and CIS4 strings into the kernel too.
PR: 51333
Submitted by: Scott Mitchell
Diffstat (limited to 'usr.sbin/pccard')
| -rw-r--r-- | usr.sbin/pccard/pccardd/cardd.c | 6 | ||||
| -rw-r--r-- | usr.sbin/pccard/pccardd/cardd.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/usr.sbin/pccard/pccardd/cardd.c b/usr.sbin/pccard/pccardd/cardd.c index fa9a277..9e392e2 100644 --- a/usr.sbin/pccard/pccardd/cardd.c +++ b/usr.sbin/pccard/pccardd/cardd.c @@ -370,6 +370,10 @@ escape: strlcpy(sp->manufstr, sp->cis->manuf, sizeof(sp->manufstr)); if (sp->cis->vers) strlcpy(sp->versstr, sp->cis->vers, sizeof(sp->versstr)); + if (sp->cis->add_info1) + strlcpy(sp->cis3str, sp->cis->add_info1, sizeof(sp->cis3str)); + if (sp->cis->add_info2) + strlcpy(sp->cis4str, sp->cis->add_info2, sizeof(sp->cis4str)); if (cp->ether) { struct ether *e = 0; @@ -994,6 +998,8 @@ setup_slot(struct slot *sp) drv.prodext = sp->prodext; strlcpy(drv.manufstr, sp->manufstr, sizeof(drv.manufstr)); strlcpy(drv.versstr, sp->versstr, sizeof(drv.versstr)); + strlcpy(drv.cis3str, sp->cis3str, sizeof(drv.cis3str)); + strlcpy(drv.cis4str, sp->cis4str, sizeof(drv.cis4str)); /* * If the driver fails to be connected to the device, * then it may mean that the driver did not recognise it. diff --git a/usr.sbin/pccard/pccardd/cardd.h b/usr.sbin/pccard/pccardd/cardd.h index b39df25..f01c51b 100644 --- a/usr.sbin/pccard/pccardd/cardd.h +++ b/usr.sbin/pccard/pccardd/cardd.h @@ -127,6 +127,8 @@ struct slot { unsigned char eaddr[6]; /* If any */ char manufstr[DEV_MAX_CIS_LEN]; char versstr[DEV_MAX_CIS_LEN]; + char cis3str[DEV_MAX_CIS_LEN]; + char cis4str[DEV_MAX_CIS_LEN]; struct allocblk io; /* I/O block spec */ struct allocblk mem; /* Memory block spec */ int irq; /* Irq value */ |
