diff options
| author |   stsp <stsp@openbsd.org> | 2015-02-23 10:25:20 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2015-02-23 10:25:20 +0000 |
| commit | cb6f6cd46139f69daa132565e33162a012bbebbb (patch) | |
| tree | 6b555bd30775b7cde6d07da91931cd24f897e538 | |
| parent | Add return_uri to serverconfig_reset() to avoid using garbage from the (diff) | |
| download | wireguard-openbsd-cb6f6cd46139f69daa132565e33162a012bbebbb.tar.xz wireguard-openbsd-cb6f6cd46139f69daa132565e33162a012bbebbb.zip | |
More iwm(4) whitespace fixes from NetBSD.
| -rw-r--r-- | sys/dev/pci/if_iwmreg.h | 38 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwmvar.h | 14 |
2 files changed, 26 insertions, 26 deletions
diff --git a/sys/dev/pci/if_iwmreg.h b/sys/dev/pci/if_iwmreg.h index 5dc4b1ef40f..7fcf981f91b 100644 --- a/sys/dev/pci/if_iwmreg.h +++ b/sys/dev/pci/if_iwmreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwmreg.h,v 1.2 2015/02/06 23:52:23 stsp Exp $ */ +/* $OpenBSD: if_iwmreg.h,v 1.3 2015/02/23 10:25:20 stsp Exp $ */ /****************************************************************************** * @@ -5231,9 +5231,9 @@ struct iwm_cmd_header { } __packed; enum iwm_power_scheme { - IWM_POWER_SCHEME_CAM = 1, - IWM_POWER_SCHEME_BPS, - IWM_POWER_SCHEME_LP + IWM_POWER_SCHEME_CAM = 1, + IWM_POWER_SCHEME_BPS, + IWM_POWER_SCHEME_LP }; #define IWM_DEF_CMD_PAYLOAD_SIZE 320 @@ -5246,19 +5246,19 @@ struct iwm_device_cmd { } __packed; struct iwm_rx_packet { - /* - * The first 4 bytes of the RX frame header contain both the RX frame - * size and some flags. - * Bit fields: - * 31: flag flush RB request - * 30: flag ignore TC (terminal counter) request - * 29: flag fast IRQ request - * 28-14: Reserved - * 13-00: RX frame size - */ - uint32_t len_n_flags; - struct iwm_cmd_header hdr; - uint8_t data[]; + /* + * The first 4 bytes of the RX frame header contain both the RX frame + * size and some flags. + * Bit fields: + * 31: flag flush RB request + * 30: flag ignore TC (terminal counter) request + * 29: flag fast IRQ request + * 28-14: Reserved + * 13-00: RX frame size + */ + uint32_t len_n_flags; + struct iwm_cmd_header hdr; + uint8_t data[]; } __packed; #define IWM_FH_RSCSR_FRAME_SIZE_MSK 0x00003fff @@ -5267,14 +5267,14 @@ static uint32_t iwm_rx_packet_len(const struct iwm_rx_packet *pkt) { - return le32toh(pkt->len_n_flags) & IWM_FH_RSCSR_FRAME_SIZE_MSK; + return le32toh(pkt->len_n_flags) & IWM_FH_RSCSR_FRAME_SIZE_MSK; } static uint32_t iwm_rx_packet_payload_len(const struct iwm_rx_packet *pkt) { - return iwm_rx_packet_len(pkt) - sizeof(pkt->hdr); + return iwm_rx_packet_len(pkt) - sizeof(pkt->hdr); } diff --git a/sys/dev/pci/if_iwmvar.h b/sys/dev/pci/if_iwmvar.h index a96d291b96b..875b40f53a6 100644 --- a/sys/dev/pci/if_iwmvar.h +++ b/sys/dev/pci/if_iwmvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwmvar.h,v 1.4 2015/02/23 09:40:47 stsp Exp $ */ +/* $OpenBSD: if_iwmvar.h,v 1.5 2015/02/23 10:25:20 stsp Exp $ */ /* * Copyright (c) 2014 genua mbh <info@genua.de> @@ -168,7 +168,7 @@ struct iwm_fw_info { struct iwm_fw_onesect { void *fws_data; uint32_t fws_len; - uint32_t fws_devoff; + uint32_t fws_devoff; } fw_sect[IWM_UCODE_SECT_MAX]; size_t fw_totlen; int fw_count; @@ -297,7 +297,7 @@ struct iwm_rx_ring { struct iwm_ucode_status { uint32_t uc_error_event_table; uint32_t uc_log_event_table; - + int uc_ok; int uc_intr; }; @@ -321,8 +321,8 @@ enum IWM_CMD_MODE { IWM_CMD_SEND_IN_RFKILL = (1 << 2), }; enum iwm_hcmd_dataflag { - IWM_HCMD_DFL_NOCOPY = (1 << 0), - IWM_HCMD_DFL_DUP = (1 << 1), + IWM_HCMD_DFL_NOCOPY = (1 << 0), + IWM_HCMD_DFL_DUP = (1 << 1), }; /* @@ -386,14 +386,14 @@ struct iwm_softc { struct iwm_dma_info sched_dma; uint32_t sched_base; - /* TX/RX rings. */ + /* TX/RX rings. */ struct iwm_tx_ring txq[IWM_MVM_MAX_QUEUES]; struct iwm_rx_ring rxq; int qfullmsk; int sc_sf_state; - /* ICT table. */ + /* ICT table. */ struct iwm_dma_info ict_dma; int ict_cur; |