diff options
Diffstat (limited to 'pcitool')
| -rw-r--r-- | pcitool/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | pcitool/camera.xml | 923 | ||||
| -rw-r--r-- | pcitool/cli.c | 12 | ||||
| -rw-r--r-- | pcitool/config.txt | 13 | ||||
| -rwxr-xr-x | pcitool/registers_and_banks.xsd | 242 |
5 files changed, 6 insertions, 1185 deletions
diff --git a/pcitool/CMakeLists.txt b/pcitool/CMakeLists.txt index 0c0eef2..2f3639f 100644 --- a/pcitool/CMakeLists.txt +++ b/pcitool/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/pcilib ${CMAKE_BINARY_DIR}/pcilib ${FASTWRITER_INCLUDE_DIRS} + ${LIBXML2_INCLUDE_DIRS} ) link_directories( diff --git a/pcitool/camera.xml b/pcitool/camera.xml deleted file mode 100644 index 753c707..0000000 --- a/pcitool/camera.xml +++ /dev/null @@ -1,923 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <banks> - <bank> - <bank_description> - <adress>bank 0</adress> - <bar>0</bar> - <size>128</size> - <protocol>default</protocol> - <read_adress>0x9010</read_adress> - <write_adress>0x9000</write_adress> - <word_size>8</word_size> - <endianess>little</endianess> - <format>%lu</format> - <name>cmosis</name> - <description>CMOSIS CMV2000 Registers</description> - </bank_description> - <registers> - <register> - <adress>1</adress> - <offset>0</offset> - <size>16</size> - <default>1088</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_number_lines</name> - <description>test</description> - </register> - <register> - <adress>3</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_start1</name> - </register> - <register> - <adress>5</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_start2</name> - </register> - <register> - <adress>7</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_start3</name> - </register> - <register> - <adress>9</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_start4</name> - </register> - <register> - <adress>11</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_start5</name> - </register> - <register> - <adress>13</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_start6</name> - </register> - <register> - <adress>15</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_start7</name> - </register> - <register> - <adress>17</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_start8</name> - </register> - <register> - <adress>19</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_number_lines1</name> - </register> - <register> - <adress>21</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_number_lines2</name> - </register> - <register> - <adress>23</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_number_lines3</name> - </register> - <register> - <adress>25</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_number_lines4</name> - </register> - <register> - <adress>27</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_number_lines5</name> - </register> - <register> - <adress>29</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_number_lines6</name> - </register> - <register> - <adress>31</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_number_lines7</name> - </register> - <register> - <adress>33</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_number_lines8</name> - </register> - <register> - <adress>35</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_sub_s</name> - </register> - <register> - <adress>37</adress> - <offset>0</offset> - <size>16</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_sub_a</name> - </register> - <register> - <adress>39</adress> - <offset>0</offset> - <size>1</size> - <default>1</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_color</name> - </register> - <register> - <adress>40</adress> - <offset>0</offset> - <size>2</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_image_flipping</name> - </register> - <register> - <adress>41</adress> - <offset>0</offset> - <size>2</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_exp_flags</name> - </register> - <register> - <adress>42</adress> - <offset>0</offset> - <size>24</size> - <default>1088</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_exp_time</name> - <views> - <view>formuu3</view> - <view>enumm3</view> - </views> - </register> - <register> - <adress>45</adress> - <offset>0</offset> - <size>24</size> - <default>1088</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_exp_step</name> - </register> - <register> - <adress>48</adress> - <offset>0</offset> - <size>24</size> - <default>1</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_exp_kp1</name> - </register> - <register> - <adress>51</adress> - <offset>0</offset> - <size>24</size> - <default>1</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_exp_kp2</name> - </register> - <register> - <adress>54</adress> - <offset>0</offset> - <size>2</size> - <default>1</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_nr_slopes</name> - </register> - <register> - <adress>55</adress> - <offset>0</offset> - <size>8</size> - <default>1</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_exp_seq</name> - </register> - <register> - <adress>56</adress> - <offset>0</offset> - <size>24</size> - <default>1088</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_exp_time2</name> - </register> - <register> - <adress>59</adress> - <offset>0</offset> - <size>24</size> - <default>1088</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_exp_step2</name> - </register> - <register> - <adress>68</adress> - <offset>0</offset> - <size>2</size> - <default>1</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_nr_slopes2</name> - </register> - <register> - <adress>69</adress> - <offset>0</offset> - <size>8</size> - <default>1</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_exp_seq2</name> - </register> - <register> - <adress>70</adress> - <offset>0</offset> - <size>16</size> - <default>1</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_number_frames</name> - </register> - <register> - <adress>72</adress> - <offset>0</offset> - <size>2</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_output_mode</name> - </register> - <register> - <adress>78</adress> - <offset>0</offset> - <size>12</size> - <default>85</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_training_pattern</name> - </register> - <register> - <adress>80</adress> - <offset>0</offset> - <size>18</size> - <default>0x3FFFF</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_channel_en</name> - </register> - <register> - <adress>82</adress> - <offset>0</offset> - <size>3</size> - <default>7</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_special_82</name> - </register> - <register> - <adress>89</adress> - <offset>0</offset> - <size>8</size> - <default>96</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_vlow2</name> - </register> - <register> - <adress>90</adress> - <offset>0</offset> - <size>8</size> - <default>96</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_vlow3</name> - </register> - <register> - <adress>100</adress> - <offset>0</offset> - <size>14</size> - <default>16260</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_offset</name> - </register> - <register> - <adress>102</adress> - <offset>0</offset> - <size>2</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_pga</name> - </register> - <register> - <adress>103</adress> - <offset>0</offset> - <size>8</size> - <default>32</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_adc_gain</name> - </register> - <register> - <adress>111</adress> - <offset>0</offset> - <size>1</size> - <default>1</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_bit_mode</name> - </register> - <register> - <adress>112</adress> - <offset>0</offset> - <size>2</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_adc_resolution</name> - </register> - <register> - <adress>115</adress> - <offset>0</offset> - <size>1</size> - <default>1</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>cmosis_special_115</name> - </register> - </registers> - </bank> - <bank> - <bank_description> - <adress>bank 1</adress> - <bar>0</bar> - <size>0x0200</size> - <protocol>default</protocol> - <read_adress>0x9000</read_adress> - <write_adress>0x9000</write_adress> - <word_size>32</word_size> - <endianess>little</endianess> - <format>0x%lx</format> - <name>fpga</name> - <description>IPECamera Registers</description> - </bank_description> - <registers> - <register> - <adress>0x00</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>spi_conf_input</name> - </register> - <register> - <adress>0x10</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>spi_conf_output</name> - </register> - <register> - <adress>0x20</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>spi_clk_speed</name> - </register> - <register> - <adress>0x30</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>firmware_info</name> - <registers_bits> - <register_bits> - <offset>0</offset> - <size>8</size> - <mode>R</mode> - <name>firmware_version</name> - </register_bits> - <register_bits> - <offset>8</offset> - <size>1</size> - <mode>R</mode> - <name>firmware_bitmode</name> - </register_bits> - <register_bits> - <offset>12</offset> - <size>2</size> - <mode>R</mode> - <name>adc_resolution</name> - </register_bits> - <register_bits> - <offset>16</offset> - <size>2</size> - <mode>R</mode> - <name>output_mode</name> - </register_bits> - </registers_bits> - </register> - <register> - <adress>0x40</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>control</name> - <registers_bits> - <register_bits> - <offset>31</offset> - <size>1</size> - <mode>R</mode> - <name>freq</name> - </register_bits> - </registers_bits> - </register> - <register> - <adress>0x50</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>status</name> - </register> - <register> - <adress>0x54</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>status2</name> - </register> - <register> - <adress>0x58</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>status3</name> - </register> - <register> - <adress>0x5c</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>fr_status</name> - </register> - <register> - <adress>0x70</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>start_address</name> - </register> - <register> - <adress>0x74</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>end_address</name> - </register> - <register> - <adress>0x78</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>rd_address</name> - </register> - <register> - <adress>0xa0</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>fr_param1</name> - <registers_bits> - <register_bits> - <offset>0</offset> - <size>10</size> - <mode>RW</mode> - <name>fr_skip_lines</name> - </register_bits> - <register_bits> - <offset>10</offset> - <size>11</size> - <mode>RW</mode> - <name>fr_num_lines</name> - </register_bits> - <register_bits> - <offset>21</offset> - <size>11</size> - <mode>RW</mode> - <name>fr_start_address</name> - </register_bits> - </registers_bits> - </register> - <register> - <adress>0xb0</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>all bits</rwmask> - <mode>RW</mode> - <name>fr_param2</name> - <registers_bits> - <register_bits> - <offset>0</offset> - <size>11</size> - <mode>RW</mode> - <name>fr_threshold_start_line</name> - </register_bits> - <register_bits> - <offset>16</offset> - <size>10</size> - <mode>RW</mode> - <name>fr_area_lines</name> - </register_bits> - </registers_bits> - </register> - <register> - <adress>0xc0</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>skiped_lines</name> - </register> - <register> - <adress>0xd0</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>all bits</rwmask> - <mode>RW</mode> - <name>fr_thresholds</name> - </register> - <register> - <adress>0xd0</adress> - <offset>0</offset> - <size>10</size> - <default>0</default> - <rwmask>all bits</rwmask> - <mode>RW</mode> - <name>fr_pixel_thr</name> - </register> - <register> - <adress>0xd0</adress> - <offset>10</offset> - <size>11</size> - <default>0</default> - <rwmask>all bits</rwmask> - <mode>RW</mode> - <name>fr_num_pixel_thr</name> - </register> - <register> - <adress>0xd0</adress> - <offset>21</offset> - <size>11</size> - <default>0</default> - <rwmask>all bits</rwmask> - <mode>RW</mode> - <name>fr_num_lines_thr</name> - </register> - <register> - <adress>0x100</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>rawdata_pkt_addr</name> - </register> - <register> - <adress>0x110</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>temperature_info</name> - <registers_bits> - <register_bits> - <offset>0</offset> - <size>16</size> - <mode>R</mode> - <name>sensor_temperature</name> - <views> - <view>formuu1</view> - <view>formuu2</view> - <view>enumm2</view> - </views> - </register_bits> - <register_bits> - <offset>16</offset> - <size>3</size> - <mode>R</mode> - <name>sensor_temperature_alarms</name> - </register_bits> - <register_bits> - <offset>19</offset> - <size>10</size> - <mode>RW</mode> - <name>fpga_temperature</name> - <views> - <view>formuu1</view> - <view>enumm1</view> - </views> - </register_bits> - <register_bits> - <offset>29</offset> - <size>3</size> - <mode>R</mode> - <name>fpga_temperature_alarms</name> - </register_bits> - </registers_bits> - </register> - <register> - <adress>0x120</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>num_lines</name> - </register> - <register> - <adress>0x130</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>start_line</name> - </register> - <register> - <adress>0x140</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>exp_time</name> - </register> - <register> - <adress>0x150</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>motor</name> - <registers_bits> - <register_bits> - <offset>0</offset> - <size>5</size> - <mode>RW</mode> - <name>motor_phi</name> - </register_bits> - <register_bits> - <offset>5</offset> - <size>5</size> - <mode>RW</mode> - <name>motor_z</name> - </register_bits> - <register_bits> - <offset>10</offset> - <size>5</size> - <mode>RW</mode> - <name>motor_y</name> - </register_bits> - <register_bits> - <offset>15</offset> - <size>5</size> - <mode>RW</mode> - <name>motor_x</name> - </register_bits> - <register_bits> - <offset>20</offset> - <size>8</size> - <mode>R</mode> - <name>adc_gain</name> - </register_bits> - </registers_bits> - </register> - <register> - <adress>0x160</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>write_status</name> - </register> - <register> - <adress>0x170</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>num_triggers</name> - </register> - <register> - <adress>0x180</adress> - <offset>0</offset> - <size>32</size> - <default>0x280</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>trigger_period</name> - <views> - <view>enumm2</view> - </views> - </register> - <register> - <adress>0x190</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>temperature_sample_period</name> - </register> - <register> - <adress>0x1a0</adress> - <offset>0</offset> - <size>32</size> - <default>0x64</default> - <rwmask>0</rwmask> - <mode>RW</mode> - <name>ddr_max_frames</name> - </register> - <register> - <adress>0x1b0</adress> - <offset>0</offset> - <size>32</size> - <default>0</default> - <rwmask>0</rwmask> - <mode>R</mode> - <name>ddr_num_frames</name> - </register> - </registers> - </bank> - <bank> - <bank_description> - <adress>DMA bank</adress> - <bar>0</bar> - <size>0x0200</size> - <protocol>default</protocol> - <read_adress>0x0</read_adress> - <write_adress>0x0</write_adress> - <word_size>32</word_size> - <endianess>little</endianess> - <format>0x%lx</format> - <name>dma</name> - <description>DMA Registers</description> - </bank_description> - </bank> - </banks> - <views> - <view type="formula"> - <name>formuu1</name> - <unit>C</unit> - <read_from_register>(503975./1024000)*@reg - 27315./100</read_from_register> - <write_to_register>(@value + 27315./100)*(102400./503975)</write_to_register> -<description>formula to get real fpga temperature from the fpga_temperature register in decimal</description> - </view> - <view type="enum"> - <name>enumm1</name> - <enum value="0x100" min="0x2" max="0x300">high</enum> - <enum value="0x010">low</enum> - <description>enum towards temperatures register</description> - </view> - <view type="formula"> - <name>formuu2</name> - <unit>C</unit> - <read_from_register>((1./4)*(@reg - 1200)) if @freq==0 else ((3./10)*(@reg - 1000))</read_from_register> - <write_to_register>4*@value + 1200 if @freq==0 else (10./3)*@value + 1000</write_to_register> - <description>formula to get real sensor temperature from the sensor_temperature register in decimal</description> - </view> - <view type="enum"> - <name>enumm2</name> - <enum value="0x120">high</enum> - <enum value="0x010" min="0x00" max="0x020">low</enum> - <description>enum towards sensor_temperature register</description> - </view> - <view type="formula"> - <name>formuu3</name> - <unit>us</unit> - <read_from_register>(@reg+(43./100))*129./(40*1000000)if @freq==0 else (@reg+(43./100))*129./(48*1000000)</read_from_register> - <write_to_register>@value/129.*(40*1000000) - 43./100 if @freq==0 else @value/129.*(48*1000000) - 43./100</write_to_register> - <description>formula to get real exposure time from the cmosis_exp_time register in decimal</description> - </view> - <view type="enum"> - <name>enumm3</name> - <enum value="0x000">short</enum> - <enum value="0x010">mid</enum> - <enum value="0x100" min="0x0F0">long</enum> - <description>enum towards cmosis_exp_register register</description> - </view> - </views> -</model> diff --git a/pcitool/cli.c b/pcitool/cli.c index 4c21e99..2ae569f 100644 --- a/pcitool/cli.c +++ b/pcitool/cli.c @@ -1,6 +1,7 @@ #define _XOPEN_SOURCE 700 #define _POSIX_C_SOURCE 200112L #define _BSD_SOURCE +#define _DEFAULT_SOURCE #include <stdio.h> #include <stdlib.h> @@ -38,7 +39,6 @@ #include "error.h" #include "debug.h" #include "model.h" -#include "xml.h" #include "locking.h" /* defines */ @@ -348,8 +348,6 @@ void Usage(int argc, char *argv[], const char *format, ...) { " Data can be specified as sequence of hexdecimal number or\n" " a single value prefixed with '*'. In this case it will be\n" " replicated the specified amount of times\n" -" XML:\n" -" -v -validates the xml file against xsd" "\n\n", argv[0]); @@ -1005,8 +1003,8 @@ int ReadRegister(pcilib_t *handle, const pcilib_model_description_t *model_info, format = model_info->banks[bank_id].format; if (!format) format = "%lu"; - err = pcilib_read_register_by_id(handle, regid, &value); - // err = pcilib_read_register(handle, bank, reg, &value); + err = pcilib_read_register_by_id(handle, regid, &value); + // err = pcilib_read_register(handle, bank, reg, &value); if (err) printf("Error reading register %s\n", reg); else { printf("%s = ", reg); @@ -3134,7 +3132,7 @@ int main(int argc, char **argv) { else Usage(argc, argv, "The %i data values is specified, but %i required", argc - optind, size); case MODE_READ: if (!addr) { - if (((!dma_info)||(!dma_info->api))&&(!model_info->api)) { + if (((!dma_info)||(!dma_info->api))&&(!model_info->api)&&(!handle->num_reg)) { // if (model == PCILIB_MODEL_PCI) { if ((amode != ACCESS_DMA)&&(amode != ACCESS_CONFIG)) Usage(argc, argv, "The address is not specified"); @@ -3394,6 +3392,6 @@ int main(int argc, char **argv) { pcilib_close(handle); if (data != argv + optind) free(data); - + return err; } diff --git a/pcitool/config.txt b/pcitool/config.txt deleted file mode 100644 index 14bcc57..0000000 --- a/pcitool/config.txt +++ /dev/null @@ -1,13 +0,0 @@ -///configuration/// - -pwd to xml model file: -camera.xml - -///pwd to units xml file: -///units.xml -/// -///pwd to python eval file: -///pythonscripts.py -/// -pwd to xsd schema file: -registers_and_banks.xsd diff --git a/pcitool/registers_and_banks.xsd b/pcitool/registers_and_banks.xsd deleted file mode 100755 index 10d49b7..0000000 --- a/pcitool/registers_and_banks.xsd +++ /dev/null @@ -1,242 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:element name="model"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="banks" type="banks_type"/> - <xsd:element name="views" type="views_type" minOccurs="0" maxOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - <xsd:key name="Registerkey"> - <xsd:selector xpath="views/view/name"/> - <xsd:field xpath="."/> - </xsd:key> - <xsd:keyref refer="Registerkey" name="RegisterkeyRef"> - <xsd:selector xpath="banks/bank/registers/register/views/view"/> - <xsd:field xpath="."/> - </xsd:keyref> - <xsd:key name="Registerbitskey"> - <xsd:selector xpath="views/view/name"/> - <xsd:field xpath="."/> - </xsd:key> - <xsd:keyref refer="Registerbitskey" name="RegisterbitskeyRef"> - <xsd:selector xpath="banks/bank/registers/register/registers_bits/register_bits/views/view"/> - <xsd:field xpath="."/> - </xsd:keyref> - </xsd:element> - - - <xsd:complexType name="views_type"> - <xsd:sequence> - <xsd:element name="view" type="view_type" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - - - <xsd:complexType name="banks_type"> - <xsd:sequence> - <xsd:element name="bank" type="banktype" minOccurs="1" maxOccurs="12"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="banktype"> - <xsd:sequence> - <xsd:element name="bank_description" type="bank_description_t"/> - <xsd:element name="registers" type="registerstype" minOccurs="0" maxOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="bank_description_t"> - <xsd:sequence> - <xsd:element name="adress" type="bank_adress_type"/> - <xsd:element name="bar" type="bar_type"/> - <xsd:element name="size" type="hexa_and_integer64_t"/> - <xsd:element name="protocol" type="xsd:string"/> - <xsd:element name="read_adress" type="hex64_t"/> - <xsd:element name="write_adress" type="hex64_t"/> - <xsd:element name="word_size" type="uint8_t"/> - <xsd:element name="endianess" type="endianess_type"/> - <xsd:element name="format" type="xsd:string"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - - - <xsd:complexType name="registerstype"> - <xsd:sequence> - <xsd:element name="register" type="register_type" minOccurs="0" maxOccurs="256"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="register_type"> - <xsd:sequence> - <xsd:element name="adress" type="hexa_and_integer32_t"/> - <xsd:element name="offset" type="uint8_t"/> - <xsd:element name="size" type="uint8_t"/> - <xsd:element name="default" type="hexa_and_integer32_t"/> - <xsd:element name="rwmask" type="rwmask_type"/> - <xsd:element name="mode" type="pcilib_register_mode_t"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> - <xsd:element name="views" type="reg_to_views_type" minOccurs="0" maxOccurs="1"/> - <xsd:element name="registers_bits" type="registers_bits_type" minOccurs="0" maxOccurs="1"/> - <xsd:element name="value_min" type="hexa_and_integer32_t" minOccurs="0" maxOccurs="1"/> - <xsd:element name="value_max" type="hexa_and_integer32_t" minOccurs="0" maxOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="registers_bits_type"> - <xsd:sequence> - <xsd:element name="register_bits" type="register_bits_type" minOccurs="1" maxOccurs="32"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="reg_to_views_type"> - <xsd:sequence> - <xsd:element name="view" type="xsd:string" minOccurs="1" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="register_bits_type"> - <xsd:sequence> - <xsd:element name="offset" type="uint8_t"/> - <xsd:element name="size" type="uint8_t"/> - <xsd:element name="mode" type="pcilib_register_mode_t"/> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/> - <xsd:element name="views" type="reg_to_views_type" minOccurs="0" maxOccurs="1"/> - </xsd:sequence> - - </xsd:complexType> - - <xsd:simpleType name="uint8_t"> - <xsd:restriction base="xsd:integer"> - <xsd:minInclusive value="0"/> - <xsd:maxInclusive value="255"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="size_t"> - <xsd:restriction base="xsd:integer"> - <xsd:minInclusive value="0"/> - <xsd:maxInclusive value="18446744073709551615"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="uintptr_t"> - <xsd:restriction base="xsd:integer"> - <xsd:minInclusive value="0"/> - <xsd:maxInclusive value="18446744073709551615"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="uint32_t"> - <xsd:restriction base="xsd:integer"> - <xsd:minInclusive value="0"/> - <xsd:maxInclusive value="4294967295"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="pcilib_register_mode_t"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="R"/> - <xsd:enumeration value="W"/> - <xsd:enumeration value="RW"/> - <xsd:enumeration value="W1C"/> - <xsd:enumeration value="RW1C"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="bank_adress_type"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="bank 0"/> - <xsd:enumeration value="bank 1"/> - <xsd:enumeration value="bank 2"/> - <xsd:enumeration value="bank 3"/> - <xsd:enumeration value="DMA bank"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="endianess_type"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="little"/> - <xsd:enumeration value="big"/> - <xsd:enumeration value="host"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="bar_type"> - <xsd:restriction base="xsd:integer"> - <xsd:enumeration value="0"/> - <xsd:enumeration value="1"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="space_adress_type"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="write adress"/> - <xsd:enumeration value="read adress"/> - <xsd:enumeration value="space adress"/> - <xsd:enumeration value="0"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="rwmask_type"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="all bits"/> - <xsd:enumeration value="0"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="hexa_and_integer32_t"> - <xsd:union memberTypes="uint32_t hex32_t"/> - </xsd:simpleType> - - <xsd:simpleType name="hex32_t"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="0x([a-fA-F0-9]){0,8}"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="hexa_and_integer64_t"> - <xsd:union memberTypes="size_t hex64_t"/> - </xsd:simpleType> - - <xsd:simpleType name="hex64_t"> - <xsd:restriction base="xsd:string"> - <xsd:pattern value="0x([a-fA-F0-9]){0,16}"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:complexType name="view_type"> - <xsd:sequence> - <xsd:element name="name" type="xsd:ID"/> - <xsd:element name="unit" type="xsd:string" minOccurs="0" maxOccurs="1"/> - <xsd:element name="read_from_register" type="xsd:string" minOccurs="0" maxOccurs="1"/> - <xsd:element name="write_to_register" type="xsd:string" minOccurs="0" maxOccurs="1"/> - <xsd:element name="enum" type="enum_t" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="description" type="xsd:string"/> - </xsd:sequence> - <xsd:attribute name="type" type="viewtype_type" use="required"/> - </xsd:complexType> - - <xsd:complexType name="enum_t"> - <xsd:simpleContent> - <xsd:extension base="xsd:string"> - <xsd:attribute name="value" type="hexa_and_integer64_t" use="required"/> - <xsd:attribute name="min" type="hexa_and_integer64_t"/> - <xsd:attribute name="max" type="hexa_and_integer64_t"/> - </xsd:extension> - </xsd:simpleContent> - </xsd:complexType> - - <xsd:simpleType name="viewtype_type"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="enum"/> - <xsd:enumeration value="formula"/> - </xsd:restriction> - </xsd:simpleType> - -</xsd:schema> |