M000252.html in ripxplore-0.13.0

- old
+ new
@@ -3,41 +3,32 @@
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
 <head>
-  <title>delete_file (AppleDos)</title>
+  <title>free_sector_list (AppleDos)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/file_systems/AppleDos.rb, line 349</span>
-  <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">delete_file</span>(<span class="ruby-identifier">file_system_image</span>,<span class="ruby-identifier">filename</span>)
-    <span class="ruby-identifier">this_files_catalog_slot</span>=<span class="ruby-identifier">find_catalog_slot</span>(<span class="ruby-identifier">file_system_image</span>,<span class="ruby-identifier">filename</span>)    
-    <span class="ruby-comment cmt">#if file not in catalog, do nothing
</span>
-    <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">this_files_catalog_slot</span>.<span class="ruby-identifier">nil?</span> 
-    <span class="ruby-identifier">file_descriptive_entry</span>=<span class="ruby-identifier">file_system_image</span>.<span class="ruby-identifier">get_sector</span>(<span class="ruby-identifier">this_files_catalog_slot</span>[<span class="ruby-value">0</span>],<span class="ruby-identifier">this_files_catalog_slot</span>[<span class="ruby-value">1</span>])[<span class="ruby-identifier">this_files_catalog_slot</span>[<span class="ruby-value">2</span>],<span class="ruby-value">0x23</span>]
-    
-    <span class="ruby-comment cmt">#mark sector as free in sector usage list
</span>
-    <span class="ruby-identifier">sector_usage_bitmap_sector</span>=<span class="ruby-identifier">file_system_image</span>.<span class="ruby-identifier">get_sector</span>(<span class="ruby-identifier">vtoc_track_no</span>,<span class="ruby-identifier">vtoc_sector_no</span>)
-    <span class="ruby-identifier">sectors_to_mark_available</span>=<span class="ruby-identifier">get_track_sector_list</span>(<span class="ruby-identifier">file_system_image</span>,<span class="ruby-identifier">file_descriptive_entry</span>[<span class="ruby-value">0x00</span>],<span class="ruby-identifier">file_descriptive_entry</span>[<span class="ruby-value">0x01</span>])
-    <span class="ruby-identifier">sectors_to_mark_available</span><span class="ruby-operator">&lt;&lt;</span>[<span class="ruby-identifier">file_descriptive_entry</span>[<span class="ruby-value">0x01</span>],<span class="ruby-identifier">file_descriptive_entry</span>[<span class="ruby-value">0x00</span>]]
-    
-    <span class="ruby-identifier">sectors_to_mark_available</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">ts</span><span class="ruby-operator">|</span>
-      <span class="ruby-identifier">offset_of_byte_containing_this_sector</span>=<span class="ruby-value">0x38</span><span class="ruby-operator">+</span>(<span class="ruby-identifier">ts</span>[<span class="ruby-value">0</span>]<span class="ruby-operator">*</span><span class="ruby-value">4</span>)
-      <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">ts</span>[<span class="ruby-value">1</span>]<span class="ruby-operator">&lt;</span><span class="ruby-value">8</span> <span class="ruby-keyword kw">then</span> 
-        <span class="ruby-identifier">offset_of_byte_containing_this_sector</span><span class="ruby-operator">+=</span><span class="ruby-value">1</span>
+  <pre><span class="ruby-comment cmt"># File lib/file_systems/AppleDos.rb, line 273</span>
+<span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">free_sector_list</span>(<span class="ruby-identifier">file_system_image</span>)
+  <span class="ruby-identifier">end_of_sector_usage_bitmap</span>=(<span class="ruby-identifier">file_system_image</span>.<span class="ruby-identifier">track_count</span><span class="ruby-operator">*</span><span class="ruby-value">4</span><span class="ruby-operator">+</span><span class="ruby-value">0x38</span>)<span class="ruby-operator">-</span><span class="ruby-value">1</span>
+  <span class="ruby-identifier">sector_usage_bitmap</span>=<span class="ruby-identifier">file_system_image</span>.<span class="ruby-identifier">get_sector</span>(<span class="ruby-identifier">vtoc_track_no</span>,<span class="ruby-identifier">vtoc_sector_no</span>)[<span class="ruby-value">0x38</span><span class="ruby-operator">..</span><span class="ruby-identifier">end_of_sector_usage_bitmap</span>]
+  <span class="ruby-identifier">free_sectors</span>=[]
+  <span class="ruby-comment cmt">#skip track 0 - even if sectors there are unused, we can't include them in a catalog or track/sector list
</span>
+    (<span class="ruby-value">1</span><span class="ruby-operator">..</span><span class="ruby-identifier">file_system_image</span>.<span class="ruby-identifier">track_count</span><span class="ruby-operator">-</span><span class="ruby-value">1</span>).<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">track</span><span class="ruby-operator">|</span>
+      <span class="ruby-identifier">track_bitmap_lo</span>=<span class="ruby-identifier">sector_usage_bitmap</span>[<span class="ruby-identifier">track</span><span class="ruby-operator">*</span><span class="ruby-value">4</span><span class="ruby-operator">+</span><span class="ruby-value">1</span>]
+      <span class="ruby-identifier">track_bitmap_hi</span>=<span class="ruby-identifier">sector_usage_bitmap</span>[<span class="ruby-identifier">track</span><span class="ruby-operator">*</span><span class="ruby-value">4</span>]
+      (<span class="ruby-value">0</span><span class="ruby-operator">..</span><span class="ruby-value">7</span>).<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">sector</span><span class="ruby-operator">|</span>
+        <span class="ruby-keyword kw">if</span> ((<span class="ruby-identifier">track_bitmap_lo</span> <span class="ruby-operator">&amp;</span> (<span class="ruby-value">2</span><span class="ruby-operator">**</span>(<span class="ruby-identifier">sector</span>)))<span class="ruby-operator">!=</span><span class="ruby-value">0</span>) <span class="ruby-keyword kw">then</span>
+          <span class="ruby-identifier">free_sectors</span><span class="ruby-operator">&lt;&lt;</span>[<span class="ruby-identifier">track</span>,<span class="ruby-identifier">sector</span>,<span class="ruby-value">0</span>]
+        <span class="ruby-keyword kw">end</span>
+        <span class="ruby-keyword kw">if</span> ((<span class="ruby-identifier">track_bitmap_hi</span> <span class="ruby-operator">&amp;</span> (<span class="ruby-value">2</span><span class="ruby-operator">**</span>(<span class="ruby-identifier">sector</span>)))<span class="ruby-operator">!=</span><span class="ruby-value">0</span>) <span class="ruby-keyword kw">then</span>
+          <span class="ruby-identifier">free_sectors</span><span class="ruby-operator">&lt;&lt;</span>[<span class="ruby-identifier">track</span>,<span class="ruby-identifier">sector</span><span class="ruby-operator">+</span><span class="ruby-value">8</span>,<span class="ruby-value">0</span>]
+        <span class="ruby-keyword kw">end</span>        
       <span class="ruby-keyword kw">end</span>
-      <span class="ruby-identifier">byte_containing_this_sector</span>=<span class="ruby-identifier">sector_usage_bitmap_sector</span>[<span class="ruby-identifier">offset_of_byte_containing_this_sector</span>]   
-      <span class="ruby-identifier">byte_containing_this_sector</span>=<span class="ruby-identifier">byte_containing_this_sector</span><span class="ruby-operator">|</span>(<span class="ruby-value">2</span><span class="ruby-operator">**</span>(<span class="ruby-identifier">ts</span>[<span class="ruby-value">1</span>]<span class="ruby-operator">%</span><span class="ruby-value">8</span>))
-      <span class="ruby-identifier">sector_usage_bitmap_sector</span>[<span class="ruby-identifier">offset_of_byte_containing_this_sector</span>]=<span class="ruby-identifier">byte_containing_this_sector</span>
     <span class="ruby-keyword kw">end</span>
-    <span class="ruby-identifier">file_system_image</span>.<span class="ruby-identifier">set_sector</span>(<span class="ruby-identifier">vtoc_track_no</span>,<span class="ruby-identifier">vtoc_sector_no</span>,<span class="ruby-identifier">sector_usage_bitmap_sector</span>)
-    
-    <span class="ruby-comment cmt">#mark slot as available in catalog
</span>
-    <span class="ruby-identifier">catalog_sector</span>=<span class="ruby-identifier">file_system_image</span>.<span class="ruby-identifier">get_sector</span>(<span class="ruby-identifier">this_files_catalog_slot</span>[<span class="ruby-value">0</span>],<span class="ruby-identifier">this_files_catalog_slot</span>[<span class="ruby-value">1</span>])
-    <span class="ruby-identifier">catalog_sector</span>[<span class="ruby-identifier">this_files_catalog_slot</span>[<span class="ruby-value">2</span>]<span class="ruby-operator">+</span><span class="ruby-value">0x20</span>]=<span class="ruby-identifier">catalog_sector</span>[<span class="ruby-identifier">this_files_catalog_slot</span>[<span class="ruby-value">2</span>]] <span class="ruby-comment cmt">#save the current &quot;first track no&quot; in last byte of filename
</span>
-    <span class="ruby-identifier">catalog_sector</span>[<span class="ruby-identifier">this_files_catalog_slot</span>[<span class="ruby-value">2</span>]]=<span class="ruby-value">0x</span><span class="ruby-constant">FF</span>
-    <span class="ruby-identifier">file_system_image</span>.<span class="ruby-identifier">set_sector</span>(<span class="ruby-identifier">this_files_catalog_slot</span>[<span class="ruby-value">0</span>],<span class="ruby-identifier">this_files_catalog_slot</span>[<span class="ruby-value">1</span>],<span class="ruby-identifier">catalog_sector</span>)
-  <span class="ruby-keyword kw">end</span></pre>
+    <span class="ruby-identifier">free_sectors</span>.<span class="ruby-identifier">sort</span>
+<span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>
\ No newline at end of file