← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to modules/shared/vmxnet/vmxnet3_defs.h

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/shared/vmxnet/vmxnet3_defs.h
42
42
 
43
43
#define INCLUDE_ALLOW_USERLEVEL
44
44
#define INCLUDE_ALLOW_VMKERNEL
45
 
 
 
45
#define INCLUDE_ALLOW_DISTRIBUTE
 
46
#define INCLUDE_ALLOW_VMKDRIVERS
46
47
#define INCLUDE_ALLOW_VMCORE
47
48
#define INCLUDE_ALLOW_MODULE
48
49
#include "includeCheck.h"
74
75
#define VMXNET3_PT_REG_SIZE     4096    /* BAR 0 */
75
76
#define VMXNET3_VD_REG_SIZE     4096    /* BAR 1 */
76
77
 
 
78
/*
 
79
 * The two Vmxnet3 MMIO Register PCI BARs (BAR 0 at offset 10h and BAR 1 at
 
80
 * offset 14h)  as well as the MSI-X BAR are combined into one PhysMem region:
 
81
 * <-VMXNET3_PT_REG_SIZE-><-VMXNET3_VD_REG_SIZE-><-VMXNET3_MSIX_BAR_SIZE-->
 
82
 * -------------------------------------------------------------------------
 
83
 * |Pass Thru Registers  | Virtual Dev Registers | MSI-X Vector/PBA Table  |
 
84
 * -------------------------------------------------------------------------
 
85
 * VMXNET3_MSIX_BAR_SIZE is defined in "vmxnet3Int.h"
 
86
 */
 
87
#define VMXNET3_PHYSMEM_PAGES   4
 
88
 
77
89
#define VMXNET3_REG_ALIGN       8  /* All registers are 8-byte aligned. */
78
90
#define VMXNET3_REG_ALIGN_MASK  0x7
79
91
 
119
131
   VMXNET3_CMD_GET_DID_LO,
120
132
   VMXNET3_CMD_GET_DID_HI,
121
133
   VMXNET3_CMD_GET_DEV_EXTRA_INFO,
122
 
   VMXNET3_CMD_GET_CONF_INTR
 
134
   VMXNET3_CMD_GET_CONF_INTR,
 
135
   VMXNET3_CMD_GET_ADAPTIVE_RING_INFO
123
136
} Vmxnet3_Cmd;
124
137
 
 
138
/* Adaptive Ring Info Flags */
 
139
#define VMXNET3_DISABLE_ADAPTIVE_RING 1
 
140
 
125
141
/*
126
142
 *      Little Endian layout of bitfields -
127
143
 *      Byte 0 :        7.....len.....0
721
737
 
722
738
#define VMXWIFI_DRIVER_SHARED_LEN 8192
723
739
 
 
740
#define VMXNET3_DID_PASSTHRU    0xFFFF
 
741
 
724
742
#endif /* _VMXNET3_DEFS_H_ */