diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-16 23:23:31 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-16 23:23:31 +0000 |
commit | 1bb56fb39d8db0c9a419818f82fa7e517cad55bc (patch) | |
tree | c6d5b6911e4ae7c85e4aa0b2f7a07c387c618d38 /nuttx/drivers/usbdev/usbdev_scsi.c | |
parent | 731994d0383c636e43644c3dc91b91b15745b345 (diff) | |
download | px4-nuttx-1bb56fb39d8db0c9a419818f82fa7e517cad55bc.tar.gz px4-nuttx-1bb56fb39d8db0c9a419818f82fa7e517cad55bc.tar.bz2 px4-nuttx-1bb56fb39d8db0c9a419818f82fa7e517cad55bc.zip |
Reserved word 'private' in C header files is a problem for C++
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1890 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/usbdev/usbdev_scsi.c')
-rw-r--r-- | nuttx/drivers/usbdev/usbdev_scsi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/drivers/usbdev/usbdev_scsi.c b/nuttx/drivers/usbdev/usbdev_scsi.c index 088dc3ec2..e17999b20 100644 --- a/nuttx/drivers/usbdev/usbdev_scsi.c +++ b/nuttx/drivers/usbdev/usbdev_scsi.c @@ -1,7 +1,7 @@ /**************************************************************************** * drivers/usbdev/usbdev_storage.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Mass storage class device. Bulk-only with SCSI subclass. @@ -1604,7 +1604,7 @@ static int usbstrg_idlestate(FAR struct usbstrg_dev_s *priv) req = privreq->req; req->len = CONFIG_USBSTRG_BULKOUTREQLEN; - req->private = privreq; + req->priv = privreq; req->callback = usbstrg_rdcomplete; if (EP_SUBMIT(priv->epbulkout, req) != OK) @@ -2046,7 +2046,7 @@ static int usbstrg_cmdreadstate(FAR struct usbstrg_dev_s *priv) /* And submit the request to the bulk IN endpoint */ req->len = priv->nreqbytes; - req->private = privreq; + req->priv = privreq; req->callback = usbstrg_wrcomplete; req->flags = 0; @@ -2189,7 +2189,7 @@ static int usbstrg_cmdwritestate(FAR struct usbstrg_dev_s *priv) */ req->len = CONFIG_USBSTRG_BULKOUTREQLEN; - req->private = privreq; + req->priv = privreq; req->callback = usbstrg_rdcomplete; ret = EP_SUBMIT(priv->epbulkout, req); @@ -2283,7 +2283,7 @@ static int usbstrg_cmdfinishstate(FAR struct usbstrg_dev_s *priv) req = privreq->req; req->len = priv->nreqbytes; req->callback = usbstrg_wrcomplete; - req->private = privreq; + req->priv = privreq; req->flags = USBDEV_REQFLAGS_NULLPKT; ret = EP_SUBMIT(priv->epbulkin, privreq->req); @@ -2429,7 +2429,7 @@ static int usbstrg_cmdstatusstate(FAR struct usbstrg_dev_s *priv) req->len = USBSTRG_CSW_SIZEOF; req->callback = usbstrg_wrcomplete; - req->private = privreq; + req->priv = privreq; req->flags = USBDEV_REQFLAGS_NULLPKT; ret = EP_SUBMIT(priv->epbulkin, req); |