Date: Mon, 2 Apr 2012 02:22:22 +0000 (UTC) From: Doug Ambrisko <ambrisko@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r233768 - head/sys/dev/mfi Message-ID: <201204020222.q322MMJS076397@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ambrisko Date: Mon Apr 2 02:22:22 2012 New Revision: 233768 URL: http://svn.freebsd.org/changeset/base/233768 Log: Change typedef atomic_t to struct mfi_atomic to avoid name space collision and some couple more style changes. Modified: head/sys/dev/mfi/mfivar.h Modified: head/sys/dev/mfi/mfivar.h ============================================================================== --- head/sys/dev/mfi/mfivar.h Mon Apr 2 00:11:26 2012 (r233767) +++ head/sys/dev/mfi/mfivar.h Mon Apr 2 02:22:22 2012 (r233768) @@ -149,16 +149,16 @@ struct mfi_aen { }; struct mfi_skinny_dma_info { - bus_dma_tag_t dmat[514]; - bus_dmamap_t dmamap[514]; - uint32_t mem[514]; - int noofmaps; + bus_dma_tag_t dmat[514]; + bus_dmamap_t dmamap[514]; + uint32_t mem[514]; + int noofmaps; }; struct mfi_cmd_tbolt; -typedef struct { - volatile unsigned int val; -} atomic_t; +struct mfi_atomic { + volatile unsigned int val; +}; #define atomic_read(v) ((v)->val) #define atomic_set(v,i) ((v)->val - (i)) @@ -240,7 +240,7 @@ struct mfi_softc { struct intr_config_hook mfi_ich; eventhandler_tag eh; /* OCR flags */ - atomic_t fw_reset_no_pci_access; + struct mfi_atomic fw_reset_no_pci_access; uint8_t adpreset; uint8_t issuepend_done; uint8_t disableOnlineCtrlReset;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204020222.q322MMJS076397>