ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/AmigaOS/ether_amiga.cpp
(Generate patch)

Comparing BasiliskII/src/AmigaOS/ether_amiga.cpp (file contents):
Revision 1.1 by cebix, 1999-10-03T14:16:25Z vs.
Revision 1.2 by cebix, 1999-10-19T19:28:14Z

# Line 135 | Line 135 | void EtherInit(void)
135          proc_error = false;
136          SetSignal(0, SIGF_SINGLE);
137          net_proc = CreateNewProcTags(
138 <                NP_Entry, net_func,
139 <                NP_Name, "Basilisk II Ethernet Task",
138 >                NP_Entry, (ULONG)net_func,
139 >                NP_Name, (ULONG)"Basilisk II Ethernet Task",
140                  NP_Priority, 1,
141                  TAG_END
142          );
# Line 287 | Line 287 | static void remove_all_protocols(void)
287   *  Copy received network packet to Mac side
288   */
289  
290 < static __saveds __asm LONG copy_to_buff(register __a0 uint8 *to, register __a1 uint8 *from, register __d0 uint32 packet_len)
290 > static __saveds __regargs LONG copy_to_buff(uint8 *to /*a0*/, uint8 *from /*a1*/, uint32 packet_len /*d0*/)
291   {
292          D(bug("CopyToBuff to %08lx, from %08lx, size %08lx\n", to, from, packet_len));
293  
# Line 313 | Line 313 | static __saveds __asm LONG copy_to_buff(
313   *  Copy data from Mac WDS to outgoing network packet
314   */
315  
316 < static __saveds __asm LONG copy_from_buff(register __a0 uint8 *to, register __a1 uint32 wds, register __d0 uint32 packet_len)
316 > static __saveds __regargs LONG copy_from_buff(uint8 *to /*a0*/, char *wds /*a1*/, uint32 packet_len /*d0*/)
317   {
318          D(bug("CopyFromBuff to %08lx, wds %08lx, size %08lx\n", to, wds, packet_len));
319   #if MONITOR
320          bug("Sending Ethernet packet:\n");
321   #endif
322          for (;;) {
323 <                int len = ReadMacInt16(wds);
323 >                int len = ReadMacInt16((uint32)wds);
324                  if (len == 0)
325                          break;
326   #if MONITOR
327 <                uint8 *adr = Mac2HostAddr(ReadMacInt32(wds + 2));
327 >                uint8 *adr = Mac2HostAddr(ReadMacInt32((uint32)wds + 2));
328                  for (int i=0; i<len; i++) {
329                          bug("%02lx ", adr[i]);
330                  }
331   #endif
332 <                CopyMem(Mac2HostAddr(ReadMacInt32(wds + 2)), to, len);
332 >                CopyMem(Mac2HostAddr(ReadMacInt32((uint32)wds + 2)), to, len);
333                  to += len;
334                  wds += 6;
335          }
# Line 635 | Line 635 | void EtherInterrupt(void)
635  
636          // Packet write done, enqueue DT to call IODone
637          if (write_done) {
638 <                Enqueue(ether_data + ed_DeferredTask, 0xd92);
638 >                EnqueueMac(ether_data + ed_DeferredTask, 0xd92);
639                  write_done = false;
640          }
641  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines